Skip to content

Commit 75dfde7

Browse files
AnastaZIukdeprilula28
authored andcommitted
pass CMAKE_MSVC_RUNTIME_LIBRARY to NBL_DXC_CMAKE_OPTIONS
1 parent c9cdfd0 commit 75dfde7

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

3rdparty/dxc/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,16 @@ list(APPEND NBL_DXC_CMAKE_OPTIONS "-DSPIRV_SKIP_TESTS:BOOL=ON")
3636
list(APPEND NBL_DXC_CMAKE_OPTIONS "-DSPIRV_SKIP_EXECUTABLES:BOOL=ON")
3737
list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_ENABLE_DEBUG_ITERATORS:BOOL=ON")
3838

39-
# perform DXC compile standard requirement test
40-
set(CMAKE_CXX_STANDARD_REQUIRED ON)
41-
set(CMAKE_CXX_STANDARD 11) # compiler must support exactly c++11 or c++14 standard in order to be able to build DXC libraries
4239
if(NBL_DYNAMIC_MSVC_RUNTIME)
43-
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
40+
list(APPEND NBL_DXC_CMAKE_OPTIONS "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
4441
else()
45-
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
42+
list(APPEND NBL_DXC_CMAKE_OPTIONS "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded$<$<CONFIG:Debug>:Debug>")
4643
endif()
4744

45+
# perform DXC compile standard requirement test
46+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
47+
set(CMAKE_CXX_STANDARD 11) # compiler must support exactly c++11 or c++14 standard in order to be able to build DXC libraries
48+
4849
try_compile(DXC_COMPILE_TEST_PASSED
4950
SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/test/test.cpp"
5051
OUTPUT_VARIABLE DXC_COMPILE_RET_VAL

0 commit comments

Comments
 (0)