Merge pull request #907 from Devsh-Graphics-Programming/exUpdates

NBL_CREATE_NSC_COMPILE_RULES and example updates

Author: AnastaZIuk

cmake/common.cmake

@@ -1325,13 +1325,17 @@ struct DeviceConfigCaps
 	endif()
 
     set(REQUIRED_SINGLE_ARGS TARGET BINARY_DIR OUTPUT_VAR INPUTS INCLUDE NAMESPACE MOUNT_POINT_DEFINE)
-    cmake_parse_arguments(IMPL "" "${REQUIRED_SINGLE_ARGS}" "COMMON_OPTIONS" ${ARGV})
+    cmake_parse_arguments(IMPL "" "${REQUIRED_SINGLE_ARGS};LINK_TO" "COMMON_OPTIONS;DEPENDS" ${ARGV})
     NBL_PARSE_REQUIRED(IMPL ${REQUIRED_SINGLE_ARGS})
 
 	if(NOT TARGET ${IMPL_TARGET})
 		add_library(${IMPL_TARGET} INTERFACE)
 	endif()
 
+	if(IMPL_LINK_TO)
+		target_link_libraries(${IMPL_LINK_TO} PUBLIC ${IMPL_TARGET})
+	endif()
+
 	if(IS_ABSOLUTE "${IMPL_INCLUDE}")
 		message(FATAL_ERROR "INCLUDE argument must be relative path")
 	endif()
@@ -1429,6 +1433,10 @@ namespace @IMPL_NAMESPACE@ {
             endif()
         endif()
 
+		if(IMPL_DEPENDS)
+			list(APPEND DEPENDS_ON ${IMPL_DEPENDS})
+		endif()
+
         set(HAS_CAPS FALSE)
         set(CAPS_LENGTH 0)
         string(JSON CAPS_TYPE TYPE "${IMPL_INPUTS}" ${INDEX} CAPS)
@@ -1625,9 +1633,14 @@ endfunction()
 
 function(NBL_CREATE_RESOURCE_ARCHIVE)
     set(REQUIRED_SINGLE_ARGS TARGET BIND NAMESPACE)
-    cmake_parse_arguments(IMPL "" "${REQUIRED_SINGLE_ARGS}" "BUILTINS" ${ARGV})
+    cmake_parse_arguments(IMPL "" "${REQUIRED_SINGLE_ARGS}" "BUILTINS;LINK_TO" ${ARGV})
     NBL_PARSE_REQUIRED(IMPL ${REQUIRED_SINGLE_ARGS})
 
+	if(NOT NBL_EMBED_BUILTIN_RESOURCES)
+		add_library(${IMPL_TARGET} INTERFACE) # dummy, could use LINK_TO but makes no difference in this case
+		return()
+	endif()
+
 	set(IMPL_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${IMPL_TARGET}")
 
 	set(_BUNDLE_ARCHIVE_ABSOLUTE_PATH_ "")
@@ -1641,17 +1654,18 @@ function(NBL_CREATE_RESOURCE_ARCHIVE)
 	get_filename_component(BUILTIN_ARCHIVE_INPUT_ABS_ENTRY "${IMPL_INPUT_DIRECTORY}" ABSOLUTE)
 	set(BUILTIN_KEY_ENTRY_ABS "${BUILTIN_ARCHIVE_INPUT_ABS_ENTRY}/${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}")
 
-	if(NBL_EMBED_BUILTIN_RESOURCES)
-		foreach(IT ${IMPL_BUILTINS})
-			if(NBL_LOG_VERBOSE)
-				message(STATUS "[${IMPL_TARGET}'s Builtins]: Registered \"${IT}\" key")
-			endif()
+	unset(NBL_RESOURCES_TO_EMBED)
+	foreach(IT ${IMPL_BUILTINS})
+		if(NBL_LOG_VERBOSE)
+			message(STATUS "[${IMPL_TARGET}'s Builtins]: Registered \"${IT}\" key")
+		endif()
 
-			LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED ${IT})
-		endforeach()
+		LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED ${IT})
+	endforeach()
 
-		ADD_CUSTOM_BUILTIN_RESOURCES(${IMPL_TARGET} NBL_RESOURCES_TO_EMBED "${_BUNDLE_SEARCH_DIRECTORY_}" "${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}" "${_BUILTIN_RESOURCES_NAMESPACE_}" "${_OUTPUT_DIRECTORY_HEADER_}" "${_OUTPUT_DIRECTORY_SOURCE_}" "${_LINK_MODE_}")
-	else()
-		add_library(${IMPL_TARGET} INTERFACE) # dummy
+	ADD_CUSTOM_BUILTIN_RESOURCES(${IMPL_TARGET} NBL_RESOURCES_TO_EMBED "${_BUNDLE_SEARCH_DIRECTORY_}" "${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}" "${_BUILTIN_RESOURCES_NAMESPACE_}" "${_OUTPUT_DIRECTORY_HEADER_}" "${_OUTPUT_DIRECTORY_SOURCE_}" "${_LINK_MODE_}")
+
+	if(IMPL_LINK_TO)
+		LINK_BUILTIN_RESOURCES_TO_TARGET(${IMPL_LINK_TO} ${IMPL_TARGET})
 	endif()
 endfunction()