File tree Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -36,15 +36,16 @@ list(APPEND NBL_DXC_CMAKE_OPTIONS "-DSPIRV_SKIP_TESTS:BOOL=ON")
36
36
list (APPEND NBL_DXC_CMAKE_OPTIONS "-DSPIRV_SKIP_EXECUTABLES:BOOL=ON" )
37
37
list (APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_ENABLE_DEBUG_ITERATORS:BOOL=ON" )
38
38
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
42
39
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" )
44
41
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>" )
46
43
endif ()
47
44
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
+
48
49
try_compile (DXC_COMPILE_TEST_PASSED
49
50
SOURCES "${CMAKE_CURRENT_SOURCE_DIR} /test/test.cpp"
50
51
OUTPUT_VARIABLE DXC_COMPILE_RET_VAL
You can’t perform that action at this time.
0 commit comments