Fixed a few ShaderMake related issues.

CMakeLists.txt

@@ -47,13 +47,15 @@ endif()
 # Point to the DXC provided through packman
 set(PACKMAN_DXC "${CMAKE_CURRENT_LIST_DIR}/dxc/bin/dxc${EXE_SUFFIX}")
 if (EXISTS "${PACKMAN_DXC}")
-	if (WIN32 AND NOT DXC_DXIL_EXECUTABLE)
-		set(DXC_DXIL_EXECUTABLE "${PACKMAN_DXC}" CACHE STRING "Path to DirectX Shader Compiler for DXIL output")
+	if (WIN32 AND NOT DXC_PATH)
+		set(DXC_PATH "${PACKMAN_DXC}" CACHE STRING "Path to DirectX Shader Compiler for DXIL output")
 	endif()
-	if (NOT DXC_SPIRV_EXECUTABLE)
-		set(DXC_SPIRV_EXECUTABLE "${PACKMAN_DXC}" CACHE STRING "Path to DirectX Shader Compiler for SPIR-V output")
+	if (NOT DXC_SPIRV_PATH)
+		set(DXC_SPIRV_PATH "${PACKMAN_DXC}" CACHE STRING "Path to DirectX Shader Compiler for SPIR-V output")
 	endif()
 endif()
+# We have our own compiler here, don't let ShaderMake search for it (and potentially fail)
+set(SHADERMAKE_SEARCH_FOR_COMPILERS OFF CACHE BOOL "")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")

NRD.cmake

@@ -1,7 +1,7 @@
 
 if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/NRD/CMakeLists.txt")
-	set(NRD_DXC_PATH ${DXC_DXIL_EXECUTABLE})
-	set(NRD_DXC_SPIRV_PATH ${DXC_SPIRV_EXECUTABLE})
+	set(NRD_DXC_PATH ${DXC_PATH})
+	set(NRD_DXC_SPIRV_PATH ${DXC_SPIRV_PATH})
 	option(NRD_STATIC_LIBRARY "" ON)
 
 	add_subdirectory(NRD)

minimal/shaders/CMakeLists.txt

@@ -7,7 +7,7 @@ set(folder "RTXDI SDK")
 set(shaders_target minimal-sample-shaders)
 
 add_custom_target(${shaders_target}
-	DEPENDS shaderCompiler
+	DEPENDS ShaderMake
 	SOURCES ${shaders} Shaders.cfg)
 
 set (OUTPUT_PATH_BASE "${CMAKE_BINARY_DIR}/bin/shaders/minimal-sample")
@@ -28,7 +28,7 @@ if (DONUT_WITH_DX12)
       -I ${CMAKE_CURRENT_SOURCE_DIR}/../../rtxdi-sdk/include
       ${USE_API_OPTION}
       --relaxedInclude "../Types.h"
-      --compiler ${DXC_DXIL_EXECUTABLE})
+      --compiler ${DXC_PATH})
 
    add_custom_command(TARGET ${shaders_target} PRE_BUILD
                      COMMAND ShaderMake
@@ -50,7 +50,7 @@ if (DONUT_WITH_VULKAN)
       --relaxedInclude "../Types.h"
       -D SPIRV
       ${NVRHI_DEFAULT_VK_REGISTER_OFFSETS}
-      --compiler ${DXC_SPIRV_EXECUTABLE})
+      --compiler ${DXC_SPIRV_PATH})
 
    add_custom_command(TARGET ${shaders_target} PRE_BUILD
                      COMMAND ShaderMake

shaders/CMakeLists.txt

@@ -7,7 +7,7 @@ set(folder "RTXDI SDK")
 set(shaders_target rtxdi-sample-shaders)
 
 add_custom_target(${shaders_target}
-    DEPENDS shaderCompiler
+    DEPENDS ShaderMake
     SOURCES ${shaders} Shaders.cfg)
 
 if(TARGET NRD)
@@ -72,7 +72,7 @@ if (DONUT_WITH_VULKAN)
       ${USE_API_OPTION}
       ${NVRHI_DEFAULT_VK_REGISTER_OFFSETS}
       -D SPIRV
-      --compiler ${DXC_SPIRV_EXECUTABLE})
+      --compiler ${DXC_SPIRV_PATH})
 
    add_custom_command(TARGET ${shaders_target} PRE_BUILD
                      COMMAND ShaderMake