create rules for building dxcompiler target the way it either doesn't conflict with our build system and has proper up-to-date updates reporting. Optimize our BS limiting therefore DXC targets in Nabla solution from over 120 to 1. Link dxcompiler to nabla given pre-configured link and search include directory paths with respect to configurations. Update 3rdparty/dxc/dxc submodule

Author: AnastaZIuk

3rdparty/dxc/CMakeLists.txt

@@ -105,4 +105,19 @@ set(DXC_EXT_EXECUTABLE "${DXC_UNPACK_DIR}/dxc.exe" CACHE STRING "" FORCE)
 
 if(_NBL_ENABLE_DXC_COMPILE_TESTS_)
 	add_subdirectory(CT CT)
-endif()
+endif()
+
+include("${DXC_BUILD_DIR}/nbl/generate/dxc/config/debug.cmake")
+include("${DXC_BUILD_DIR}/nbl/generate/dxc/config/release.cmake")
+
+set(DXC_INCLUDE_DIRECTORIES
+	$<IF:$<CONFIG:Debug>,${NBL_DXC_DEBUG_INCLUDE_DIRECTORIES},${NBL_DXC_RELEASE_INCLUDE_DIRECTORIES}>
+CACHE INTERNAL "")
+
+set(DXC_LIB
+	$<IF:$<CONFIG:Debug>,${NBL_DXC_DEBUG_LIB},${NBL_DXC_RELEASE_LIB}>
+CACHE INTERNAL "")
+
+set(DXC_DLL 
+	$<IF:$<CONFIG:Debug>,${NBL_DXC_DEBUG_DLL},${NBL_DXC_RELEASE_DLL}>
+CACHE INTERNAL "")

3rdparty/dxc/CT/CMakeLists.txt

@@ -129,8 +129,6 @@ 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 dxcompiler)
-
 unset(_NBL_DXC_CT_BIN_OUTPUTS_)
 unset(_NBL_DXC_CT_BINARY_BIN_)
 unset(_NBL_DXC_CT_INCLUDE_ROOT_)

3rdparty/dxc/dxc

@@ -581,18 +581,26 @@ if(_NBL_COMPILE_WITH_GLI_)
 endif()
 
 # DXC
-#if(_NBL_ENABLE_DXC_COMPILE_TESTS_)
-#	add_dependencies(Nabla HLSL_NABLA_COMPILE_TEST)
-#else()
-#	add_dependencies(Nabla dxcompiler)
-#endif()
-
-#target_include_directories(Nabla PRIVATE $<TARGET_PROPERTY:dxcompiler,INCLUDE_DIRECTORIES>)
-#if(NBL_STATIC_BUILD)
-#	target_link_libraries(Nabla INTERFACE dxcompiler)
-#else()
-#	target_link_libraries(Nabla PRIVATE dxcompiler)
-#endif()
+if(_NBL_ENABLE_DXC_COMPILE_TESTS_)
+	add_dependencies(Nabla HLSL_NABLA_COMPILE_TEST)
+endif()
+
+add_custom_command(OUTPUT "${DXC_LIB}" "${DXC_DLL}"
+	COMMAND "${CMAKE_COMMAND}" --build "${DXC_BUILD_DIR}" --target dxcompiler --config $<IF:$<CONFIG:Debug>,Debug,Release> -v --clean-first
+	VERBATIM
+	COMMAND_EXPAND_LISTS
+)
+
+add_custom_target(dxcompiler DEPENDS "${DXC_LIB}" "${DXC_DLL}")
+add_dependencies(Nabla dxcompiler)
+
+target_include_directories(Nabla PRIVATE "${DXC_INCLUDE_DIRECTORIES}")
+if(NBL_STATIC_BUILD)
+	target_link_libraries(Nabla INTERFACE "${DXC_LIB}")
+else()
+	target_link_libraries(Nabla PRIVATE "${DXC_LIB}")
+endif()
+	
 
 # Linux Display Systems
 if (UNIX AND NOT ANDROID AND NOT APPLE)