Use FetchContent for the DXC executable and therefore optimize DXC BS integration a lot

Author: AnastaZIuk

3rdparty/dxc/CMakeLists.txt

@@ -46,8 +46,38 @@ endif()
 add_subdirectory(dxc dxc) # for dxcompiler target
 set(CMAKE_CXX_STANDARD 20) # it's mandatory
 
-add_subdirectory(exe exe) # for dxc executable
+include(FetchContent)
+set(FC_EXTERNAL_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/external")
 
-#if(_NBL_ENABLE_DXC_COMPILE_TESTS_)
-#	add_subdirectory(CT CT)
-#endif()
+set(DXC_BINARY_DIR "${FC_EXTERNAL_BINARY_DIR}/dxc" CACHE INTERNAL "")
+set(DXC_DOWNLOAD_DIR "${DXC_BINARY_DIR}/download" CACHE INTERNAL "")
+set(DXC_UNPACK_DIR "${DXC_BINARY_DIR}/unpack" CACHE INTERNAL "")
+
+FetchContent_Declare(
+	FC_DXC
+	URL 			  "${CMAKE_CURRENT_SOURCE_DIR}/exe/bin.tar.bz2"
+	DOWNLOAD_DIR      "${DXC_DOWNLOAD_DIR}"
+	SOURCE_DIR		  "${DXC_UNPACK_DIR}"
+	BINARY_DIR        "${DXC_BINARY_DIR}"
+)
+
+if(NOT DEFINED FC_DXC_POPULATED OR NOT ${FC_DXC_POPULATED})
+	message(STATUS "Populating DXC executable...")
+	
+	FetchContent_MakeAvailable(FC_DXC)
+	FetchContent_GetProperties(FC_DXC POPULATED _FC_DXC_POPULATED_)
+	
+	if(${_FC_DXC_POPULATED_})
+		set(FC_DXC_POPULATED ON CACHE INTERNAL "")
+	else()
+		set(FC_DXC_POPULATED OFF CACHE INTERNAL "")
+	endif()
+	
+	unset(_FC_DXC_POPULATED_)
+endif()
+
+set(DXC_EXT_EXECUTABLE "${DXC_UNPACK_DIR}/dxc.exe" CACHE STRING "" FORCE)
+
+if(_NBL_ENABLE_DXC_COMPILE_TESTS_)
+	add_subdirectory(CT CT)
+endif()

3rdparty/dxc/CT/CMakeLists.txt

@@ -52,7 +52,7 @@ function(NBL_DXC_CT_ADD_INPUT_FILE _NBL_INPUT_REL_FILEPATH_ _NBL_PROFILE_ _NBL_E
 	# include-dependency input file chain
 	set(_NBL_DXC_CT_CURRENT_DEPENDS_FILEPATH_ "${_NBL_DXC_CT_CURRENT_OUTPUT_BIN_DIR_}/depends.txt")
 	set(_NBL_DXC_CT_CURRENT_IDC_FILEPATH_ "${_NBL_DXC_CT_CURRENT_OUTPUT_BIN_DIR_}/depends.cmd")
-	string(APPEND _NBL_DXC_CT_WRAPPER_IDC_COMMAND_ "${_TMP_CLEAN_ENV_}\"${DXC_EXECUTABLE}\" -HV 2021 -T ${_NBL_PROFILE_} ${_TMP_ENTRY_POINT_ARG_} ${_TMP_ENABLE_SPIRV_GEN_ARG_} -I\"${_NBL_DXC_CT_INCLUDE_ROOT_}\" -Zi -MF \"${_NBL_DXC_CT_CURRENT_DEPENDS_FILEPATH_}\" \"${_SHADER_FILE_PATH_}\"")
+	string(APPEND _NBL_DXC_CT_WRAPPER_IDC_COMMAND_ "${_TMP_CLEAN_ENV_}\"${DXC_EXT_EXECUTABLE}\" -HV 2021 -T ${_NBL_PROFILE_} ${_TMP_ENTRY_POINT_ARG_} ${_TMP_ENABLE_SPIRV_GEN_ARG_} -I\"${_NBL_DXC_CT_INCLUDE_ROOT_}\" -Zi -MF \"${_NBL_DXC_CT_CURRENT_DEPENDS_FILEPATH_}\" \"${_SHADER_FILE_PATH_}\"")
 	file(WRITE "${_NBL_DXC_CT_CURRENT_IDC_FILEPATH_}" "${_NBL_DXC_CT_WRAPPER_IDC_COMMAND_}")
 
 	# create a file contating paths to all input file's dependencies scanned recursively
@@ -84,7 +84,7 @@ function(NBL_DXC_CT_ADD_INPUT_FILE _NBL_INPUT_REL_FILEPATH_ _NBL_PROFILE_ _NBL_E
 	unset(_NBL_DXC_CT_DEPENDENCIES_L_)
 
 	# compile command
-	string(APPEND _NBL_DXC_CT_WRAPPER_COMPILE_COMMAND_ "${_TMP_CLEAN_ENV_}\"${DXC_EXECUTABLE}\" -HV 2021 -T ${_NBL_PROFILE_} ${_TMP_ENTRY_POINT_ARG_} ${_TMP_ENABLE_SPIRV_GEN_ARG_} -I\"${_NBL_DXC_CT_INCLUDE_ROOT_}\" -Zi -Fo \"${_NBL_DXC_CT_CURRENT_OUTPUT_FILEPATH_}\" \"${_SHADER_FILE_PATH_}\"")
+	string(APPEND _NBL_DXC_CT_WRAPPER_COMPILE_COMMAND_ "${_TMP_CLEAN_ENV_}\"${DXC_EXT_EXECUTABLE}\" -HV 2021 -T ${_NBL_PROFILE_} ${_TMP_ENTRY_POINT_ARG_} ${_TMP_ENABLE_SPIRV_GEN_ARG_} -I\"${_NBL_DXC_CT_INCLUDE_ROOT_}\" -Zi -Fo \"${_NBL_DXC_CT_CURRENT_OUTPUT_FILEPATH_}\" \"${_SHADER_FILE_PATH_}\"")
 	set(_NBL_DXC_CT_CURRENT_SHADER_COMPILE_FILEPATH_ "${_NBL_DXC_CT_CURRENT_OUTPUT_BIN_DIR_}/compile.cmd")
 	file(WRITE "${_NBL_DXC_CT_CURRENT_SHADER_COMPILE_FILEPATH_}" "${_NBL_DXC_CT_WRAPPER_COMPILE_COMMAND_}")
 
@@ -129,7 +129,7 @@ add_custom_target(HLSL_NABLA_COMPILE_TEST DEPENDS ${_NBL_DXC_CT_BIN_OUTPUTS_}
 	COMMENT "${CMAKE_COMMAND}" -E echo "Launching Nabla HLSL compile test..."
 )
 
-add_dependencies(HLSL_NABLA_COMPILE_TEST dxc)
+add_dependencies(HLSL_NABLA_COMPILE_TEST dxcompiler)
 
 unset(_NBL_DXC_CT_BIN_OUTPUTS_)
 unset(_NBL_DXC_CT_BINARY_BIN_)

3rdparty/dxc/exe/CMakeLists.txt

@@ -583,7 +583,7 @@ endif()
 if(_NBL_ENABLE_DXC_COMPILE_TESTS_)
 	add_dependencies(Nabla HLSL_NABLA_COMPILE_TEST)
 else()
-	add_dependencies(Nabla dxcompiler build_dxc_exe)
+	add_dependencies(Nabla dxcompiler)
 endif()
 target_include_directories(Nabla PRIVATE 
 	"${DXC_BINARY_DIR_GE}/tools/clang/tools/dxcompiler"