Skip to content

Commit 2fcac2a

Browse files
authored
CMake code review (#380)
1 parent dc8a9dc commit 2fcac2a

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(DIRECTXTK12_VERSION 1.6.4)
711

812
if(XBOX_CONSOLE_TARGET STREQUAL "durango")
@@ -313,14 +317,18 @@ if(NOT USE_PREBUILT_SHADERS)
313317
USES_TERMINAL)
314318
endif()
315319

320+
add_library(${PROJECT_NAME})
321+
322+
target_sources(${PROJECT_NAME} PRIVATE ${LIBRARY_HEADERS} ${LIBRARY_SOURCES})
323+
316324
if(WIN32 AND BUILD_SHARED_LIBS)
317325
message(STATUS "Build library as a DLL")
318326

319327
configure_file(
320328
"${CMAKE_CURRENT_SOURCE_DIR}/build/DirectXTK12.rc.in"
321329
"${CMAKE_CURRENT_BINARY_DIR}/DirectXTK12.rc" @ONLY)
322330

323-
add_library(${PROJECT_NAME} SHARED ${LIBRARY_SOURCES} ${LIBRARY_HEADERS} "${CMAKE_CURRENT_BINARY_DIR}/DirectXTK12.rc")
331+
target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/DirectXTK12.rc")
324332

325333
target_compile_definitions(${PROJECT_NAME} PRIVATE DIRECTX_TOOLKIT_EXPORT)
326334
target_compile_definitions(${PROJECT_NAME} INTERFACE DIRECTX_TOOLKIT_IMPORT)
@@ -338,8 +346,6 @@ if(WIN32 AND BUILD_SHARED_LIBS)
338346
if(MINGW AND BUILD_XINPUT)
339347
target_link_libraries(${PROJECT_NAME} PRIVATE xinput1_4.lib)
340348
endif()
341-
else()
342-
add_library(${PROJECT_NAME} ${LIBRARY_SOURCES} ${LIBRARY_HEADERS})
343349
endif()
344350

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

0 commit comments

Comments
 (0)