handle Nabla & DXC package keys with INTERFACE to expose in defines header

Author: AnastaZIuk

cmake/common.cmake

@@ -157,8 +157,6 @@ macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
 		target_compile_definitions(${EXECUTABLE_NAME}
 			PRIVATE "-DNBL_CPACK_PACKAGE_NABLA_DLL_DIR=\"${_NBL_NABLA_PACKAGE_RUNTIME_DLL_DIR_PATH_REL_TO_TARGET_}\"" 
 			PRIVATE	"-DNBL_CPACK_PACKAGE_DXC_DLL_DIR=\"${_NBL_DXC_PACKAGE_RUNTIME_DLL_DIR_PATH_REL_TO_TARGET_}\""
-			PRIVATE "-DNBL_CPACK_PACKAGE_NABLA_DLL_DIR_ABS_KEY=\"${_NBL_NABLA_PACKAGE_RUNTIME_DLL_DIR_PATH_}\"" 
-			PRIVATE	"-DNBL_CPACK_PACKAGE_DXC_DLL_DIR_ABS_KEY=\"${_NBL_DXC_PACKAGE_RUNTIME_DLL_DIR_PATH_}\""
 		)
 	endif()
 

src/nbl/CMakeLists.txt

@@ -364,8 +364,8 @@ if(NBL_CPACK_NO_BUILD_DIRECTORY_MODULES)
 endif()
 
 target_compile_definitions(Nabla 
-	PUBLIC _DXC_DLL_="${DXC_DLL}"
-	PUBLIC _DXC_DLL_NAME_="$<PATH:REMOVE_EXTENSION,${DXC_DLL_NAME}>"
+	INTERFACE _DXC_DLL_="${DXC_DLL}"
+	INTERFACE _DXC_DLL_NAME_="$<PATH:REMOVE_EXTENSION,${DXC_DLL_NAME}>"
 	PRIVATE __NBL_BUILDING_NABLA__
 )
 
@@ -393,8 +393,9 @@ endif()
 set(NBL_ASSEMBLY_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/devshgraphicsprogramming.nabla")
 if(NOT NBL_STATIC_BUILD)
 	set_target_properties(Nabla PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${NBL_ASSEMBLY_DIRECTORY})
-	target_compile_definitions(Nabla PUBLIC
-		_NABLA_DLL_NAME_="$<PATH:REMOVE_EXTENSION,$<TARGET_FILE_NAME:Nabla>>";_NABLA_OUTPUT_DIR_="${NBL_ASSEMBLY_DIRECTORY}"
+	target_compile_definitions(Nabla
+		INTERFACE _NABLA_DLL_NAME_="$<PATH:REMOVE_EXTENSION,$<TARGET_FILE_NAME:Nabla>>"
+		INTERFACE _NABLA_OUTPUT_DIR_="${NBL_ASSEMBLY_DIRECTORY}"
 	)
 endif()
 
@@ -679,7 +680,7 @@ if(NBL_EMBED_BUILTIN_RESOURCES)
 endif()
 
 target_compile_definitions(Nabla 
-	PUBLIC _NABLA_INSTALL_DIR_="${CMAKE_INSTALL_PREFIX}"
+	INTERFACE _NABLA_INSTALL_DIR_="${CMAKE_INSTALL_PREFIX}"
 )
 
 set(DEFINE_H "${CMAKE_CURRENT_BINARY_DIR}/include/$<CONFIG>/define.h")
@@ -789,4 +790,11 @@ endif()
 nbl_install_program_spec("${DXC_DLL}" "nbl/3rdparty/dxc")
 nbl_install_dir_spec(../../include/nbl/application_templates nbl)
 
+# note: keep after install rules due to NBL_3RDPARTY_DXC_NS_PACKAGE_RUNTIME_DLL_DIR_PATH property
+get_property(_NBL_DXC_PACKAGE_RUNTIME_DLL_DIR_PATH_ GLOBAL PROPERTY NBL_3RDPARTY_DXC_NS_PACKAGE_RUNTIME_DLL_DIR_PATH)
+target_compile_definitions(Nabla 
+	INTERFACE NBL_CPACK_PACKAGE_NABLA_DLL_DIR_ABS_KEY="$<GENEX_EVAL:$<TARGET_PROPERTY:Nabla,NBL_PACKAGE_RUNTIME_DLL_DIR_PATH>>"
+	INTERFACE NBL_CPACK_PACKAGE_DXC_DLL_DIR_ABS_KEY="${_NBL_DXC_PACKAGE_RUNTIME_DLL_DIR_PATH_}"
+)
+
 NBL_ADJUST_FOLDERS(src)