Skip to content

Commit e9131cf

Browse files
authored
Update CMakeLists.txt with DXC HLSL_AUTOCRLF workaround
1 parent 8f05941 commit e9131cf

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

3rdparty/dxc/CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ 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+
if(WIN32)
40+
if(NOT DEFINED HLSL_AUTOCRLF)
41+
list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_AUTOCRLF:BOOL=ON")
42+
else()
43+
list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_AUTOCRLF:BOOL=${HLSL_AUTOCRLF}")
44+
endif()
45+
endif()
46+
3947
if(NBL_DYNAMIC_MSVC_RUNTIME)
4048
list(APPEND NBL_DXC_CMAKE_OPTIONS "-DCMAKE_MSVC_RUNTIME_LIBRARY:STATIC=MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
4149
else()
@@ -142,4 +150,4 @@ cmake_path(GET NBL_DXC_RELEASE_DLL FILENAME _NBL_DXC_RELEASE_DLL_NAME_)
142150

143151
set(DXC_DLL_NAME
144152
$<IF:$<CONFIG:Debug>,${_NBL_DXC_DEBUG_DLL_NAME_},${_NBL_DXC_RELEASE_DLL_NAME_}>
145-
CACHE INTERNAL "")
153+
CACHE INTERNAL "")

0 commit comments

Comments
 (0)