update scripts for generating define.h header - add _DXC_DLL_NAME_

Author: AnastaZIuk

3rdparty/dxc/CMakeLists.txt

@@ -121,4 +121,11 @@ CACHE INTERNAL "")
 
 set(DXC_DLL 
 	$<IF:$<CONFIG:Debug>,${NBL_DXC_DEBUG_DLL},${NBL_DXC_RELEASE_DLL}>
+CACHE INTERNAL "")
+
+cmake_path(GET NBL_DXC_DEBUG_DLL FILENAME _NBL_DXC_DEBUG_DLL_NAME_)
+cmake_path(GET NBL_DXC_RELEASE_DLL FILENAME _NBL_DXC_RELEASE_DLL_NAME_)
+
+set(DXC_DLL_NAME 
+	$<IF:$<CONFIG:Debug>,${_NBL_DXC_DEBUG_DLL_NAME_},${_NBL_DXC_RELEASE_DLL_NAME_}>
 CACHE INTERNAL "")

cmake/install/nbl/sharedDefines.h.in

@@ -4,4 +4,5 @@
 */
 
 #define _NABLA_DLL_NAME_ "@_NABLA_DLL_NAME_@"
+#define _DXC_DLL_NAME_ "@_DXC_DLL_NAME_@"
 #define _NABLA_INSTALL_DIR_ @_NABLA_INSTALL_DIR_@

cmake/scripts/nbl/nablaDefines.cmake

@@ -42,6 +42,10 @@ if(NOT DEFINED _NABLA_DLL_NAME_)
 	message(FATAL_ERROR  "_NABLA_DLL_NAME_ variable must be specified for this script!")
 endif()
 
+if(NOT DEFINED _DXC_DLL_NAME_)
+	message(FATAL_ERROR  "_DXC_DLL_NAME_ variable must be specified for this script!")
+endif()
+
 if(NOT DEFINED _NABLA_INSTALL_DIR_)
 	message(FATAL_ERROR  "_NABLA_INSTALL_DIR_ variable must be specified for this script!")
 endif()

src/nbl/CMakeLists.txt

@@ -633,7 +633,7 @@ propagate_changed_variables_to_parent_scope()
 
 if(NOT NBL_STATIC_BUILD)
 	add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/generated/define.h"
-		COMMAND "${CMAKE_COMMAND}" -DNBL_ROOT_PATH:PATH=${NBL_ROOT_PATH} -DNBL_WRAPPER_FILE:FILEPATH=${_NBL_DEFINE_FILE_WRAPPER_} -DNBL_GEN_DIRECTORY:PATH=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/generated -D_NABLA_DLL_NAME_:STRING=$<TARGET_FILE_NAME:Nabla> -D_NABLA_INSTALL_DIR_:PATH="${CMAKE_INSTALL_PREFIX}" -P ${NBL_ROOT_PATH}/cmake/scripts/nbl/nablaDefines.cmake
+		COMMAND "${CMAKE_COMMAND}" -DNBL_ROOT_PATH:PATH=${NBL_ROOT_PATH} -DNBL_WRAPPER_FILE:FILEPATH=${_NBL_DEFINE_FILE_WRAPPER_} -DNBL_GEN_DIRECTORY:PATH=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/generated -D_NABLA_DLL_NAME_:STRING=$<TARGET_FILE_NAME:Nabla> -D_DXC_DLL_NAME_:STRING=${DXC_DLL_NAME} -D_NABLA_INSTALL_DIR_:PATH="${CMAKE_INSTALL_PREFIX}" -P ${NBL_ROOT_PATH}/cmake/scripts/nbl/nablaDefines.cmake
 		COMMENT "Launching defines.h generation script!"
 		VERBATIM
 	)