execute configuration for DXC only once, passtrough CMAKE_BUILD_TYPE for single-configuration generators (makefile/ninja in single config mode) - it doesn't matter for multi-configuration generators

Author: AnastaZIuk

3rdparty/dxc/CMakeLists.txt

@@ -62,37 +62,23 @@ endif()
 set(DXC_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CACHE INTERNAL "")
 
 if(WIN32)
-execute_process(COMMAND "${CMAKE_COMMAND}" -C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake" -S "${CMAKE_CURRENT_SOURCE_DIR}/dxc" -B "${DXC_BUILD_DIR}" -G "${CMAKE_GENERATOR}" "-Ax64" -T "${CMAKE_GENERATOR_TOOLSET}" ${NBL_DXC_CMAKE_OPTIONS}
-	RESULT_VARIABLE DXC_CMAKE_RESULT
-	OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
-)
-
+	execute_process(COMMAND "${CMAKE_COMMAND}" -C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake" -S "${CMAKE_CURRENT_SOURCE_DIR}/dxc" -B "${DXC_BUILD_DIR}" -G "${CMAKE_GENERATOR}" "-Ax64" -T "${CMAKE_GENERATOR_TOOLSET}" ${NBL_DXC_CMAKE_OPTIONS}
+		RESULT_VARIABLE DXC_CMAKE_RESULT
+		OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
+	)
 else()
-
-execute_process(COMMAND "${CMAKE_COMMAND}" 
-	-S "${CMAKE_CURRENT_SOURCE_DIR}/dxc"
-	-C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake"
-	-G "${CMAKE_GENERATOR}" 
-	-T "${CMAKE_GENERATOR_TOOLSET}"
-	-B "${DXC_BUILD_DIR}" 
-	-D "CMAKE_BUILD_TYPE:STRING=Debug"
-	RESULT_VARIABLE DXC_CMAKE_RESULT
-	OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
-)
-
-execute_process(COMMAND "${CMAKE_COMMAND}" 
-	-S "${CMAKE_CURRENT_SOURCE_DIR}/dxc"
-	-C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake"
-	-G "${CMAKE_GENERATOR}" 
-	-T "${CMAKE_GENERATOR_TOOLSET}"
-	-B "${DXC_BUILD_DIR}" 
-	-D "CMAKE_BUILD_TYPE:STRING=Release"
-	RESULT_VARIABLE DXC_CMAKE_RESULT
-	OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
-)
+	execute_process(COMMAND "${CMAKE_COMMAND}" 
+		-S "${CMAKE_CURRENT_SOURCE_DIR}/dxc"
+		-C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake"
+		-G "${CMAKE_GENERATOR}" 
+		-T "${CMAKE_GENERATOR_TOOLSET}"
+		-B "${DXC_BUILD_DIR}" 
+		-D "CMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}"
+		RESULT_VARIABLE DXC_CMAKE_RESULT
+		OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
+	)
 endif()
 
-
 if(NOT "${DXC_CMAKE_RESULT}" STREQUAL "0")
 	message(FATAL_ERROR "${DXC_CMAKE_STREAM_PIPE}")
 endif()