Skip to content

Commit 2ac2e8c

Browse files
authored
CMake code review (#609)
1 parent 7da4f7c commit 2ac2e8c

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33

44
cmake_minimum_required (VERSION 3.21)
55

6+
if(POLICY CMP0162)
7+
cmake_policy(SET CMP0162 NEW)
8+
endif()
9+
610
set(DIRECTXTK_VERSION 1.9.2)
711

812
if(XBOX_CONSOLE_TARGET STREQUAL "durango")
@@ -272,14 +276,18 @@ if(NOT USE_PREBUILT_SHADERS)
272276
USES_TERMINAL)
273277
endif()
274278

279+
add_library(${PROJECT_NAME})
280+
281+
target_sources(${PROJECT_NAME} PRIVATE ${LIBRARY_HEADERS} ${LIBRARY_SOURCES})
282+
275283
if(WIN32 AND BUILD_SHARED_LIBS)
276284
message(STATUS "Build library as a DLL")
277285

278286
configure_file(
279287
"${CMAKE_CURRENT_SOURCE_DIR}/build/DirectXTK.rc.in"
280288
"${CMAKE_CURRENT_BINARY_DIR}/DirectXTK.rc" @ONLY)
281289

282-
add_library(${PROJECT_NAME} SHARED ${LIBRARY_SOURCES} ${LIBRARY_HEADERS} "${CMAKE_CURRENT_BINARY_DIR}/DirectXTK.rc")
290+
target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/DirectXTK.rc")
283291

284292
target_compile_definitions(${PROJECT_NAME} PRIVATE DIRECTX_TOOLKIT_EXPORT)
285293
target_compile_definitions(${PROJECT_NAME} INTERFACE DIRECTX_TOOLKIT_IMPORT)
@@ -291,8 +299,6 @@ if(WIN32 AND BUILD_SHARED_LIBS)
291299
if(MINGW AND BUILD_XINPUT)
292300
target_link_libraries(${PROJECT_NAME} PRIVATE xinput1_4.lib)
293301
endif()
294-
else()
295-
add_library(${PROJECT_NAME} ${LIBRARY_SOURCES} ${LIBRARY_HEADERS})
296302
endif()
297303

298304
target_include_directories(${PROJECT_NAME} PRIVATE ${COMPILED_SHADERS} Src)

0 commit comments

Comments
 (0)