save work, don't add every builtin resource as Nabla dependency, hardcode path in CArchive.h.in

Author: AnastaZIuk

src/nbl/CMakeLists.txt

@@ -369,10 +369,12 @@ source_group("Resources to embed" FILES ${NABLA_RESOURCES_TO_EMBED_PUBLIC})
 
 set(NABLA_HEADERS "${NBL_ROOT_PATH}/include/nabla.h" ${NABLA_HEADERS_PUBLIC} ${NABLA_HEADERS_PIRV1} ${NABLA_HEADERS_PRIV2})
 
+get_target_property(_BUILTIN_RESOURCES_HEADER_DIRECTORY_ nblBuiltinResourceData BUILTIN_RESOURCES_HEADER_DIRECTORY)
+
 set(NBL_LIBRARY_CREATION_SOURCES 
 	${NABLA_SRCS_COMMON}
 	${NABLA_HEADERS}
-	${_NBL_BUILTIN_RESOURCES_ARCHIVE_APK_SOURCES_}
+	${_BUILTIN_RESOURCES_HEADER_DIRECTORY_}
 	$<TARGET_OBJECTS:aesGladman>
 	$<TARGET_OBJECTS:bzip2>
 	$<TARGET_OBJECTS:lz4>
@@ -421,15 +423,15 @@ if(NOT NBL_STATIC_BUILD)
 endif()
 
 if(NBL_EMBED_BUILTIN_RESOURCES)
-	add_dependencies(Nabla ${_NBL_BUILTIN_RESOURCES_LIBRARIES_})
+	add_dependencies(Nabla nblBuiltinResourceData)
 
 	if(NBL_STATIC_BUILD)
 		target_link_libraries(Nabla INTERFACE
-			${_NBL_BUILTIN_RESOURCES_LIBRARIES_}
+			nblBuiltinResourceData
 		)
 	else()
 		target_link_libraries(Nabla PRIVATE 
-			${_NBL_BUILTIN_RESOURCES_LIBRARIES_}
+			nblBuiltinResourceData
 		)
 	endif()
 endif()

src/nbl/builtin/template/CArchive.h.in

@@ -6,6 +6,7 @@
 
 namespace @_NAMESPACE_@
 {
+    constexpr std::string_view path = "@_NAMESPACE_@/@_PATH_PREFIX_@"
 	constexpr std::string_view pathPrefix = "@_PATH_PREFIX_@";
 	constexpr bool hasPathPrefix(std::string_view str) { return str.find(pathPrefix) == 0ull; }
 
@@ -14,8 +15,8 @@ namespace @_NAMESPACE_@
 	class CArchive final : public nbl::system::CFileArchive
 	{
 		public:
-			inline CArchive(nbl::system::path _path, nbl::system::logger_opt_smart_ptr&& logger)
-				: nbl::system::CFileArchive(std::move(_path),std::move(logger), getItemList()) {}
+			inline CArchive(nbl::system::logger_opt_smart_ptr&& logger)
+				: nbl::system::CFileArchive(std::move(nbl::system::path(path.data())),std::move(logger), getItemList()) {}
 
 		protected:
 			file_buffer_t getFileBuffer(const nbl::system::IFileArchive::SListEntry* item) override

src/nbl/builtin/utils.cmake

@@ -100,7 +100,10 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
 		"${NBL_BUILTIN_RESOURCE_DATA_SOURCE}"
 	)
 
-	target_include_directories(${_TARGET_NAME_} PUBLIC "${NBL_ROOT_PATH}/include")
+	target_include_directories(${_TARGET_NAME_} PUBLIC 
+		"${NBL_ROOT_PATH}/include"
+		"${_OUTPUT_HEADER_DIRECTORY_}"
+	)
 	set_target_properties(${_TARGET_NAME_} PROPERTIES CXX_STANDARD 20)
 
 	if(NBL_DYNAMIC_MSVC_RUNTIME)
@@ -115,12 +118,6 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
 		"${_OUTPUT_HEADER_DIRECTORY_}/CArchive.h"
 	)
 
-	list(APPEND _NBL_BUILTIN_RESOURCES_ARCHIVE_APK_SOURCES_ "${_OUTPUT_HEADER_DIRECTORY_}/CArchive.h")
-	set(_NBL_BUILTIN_RESOURCES_ARCHIVE_APK_SOURCES_ ${_NBL_BUILTIN_RESOURCES_ARCHIVE_APK_SOURCES_} PARENT_SCOPE)
-	
-	list(APPEND _NBL_BUILTIN_RESOURCES_LIBRARIES_ ${_TARGET_NAME_})
-	set(_NBL_BUILTIN_RESOURCES_LIBRARIES_ ${_NBL_BUILTIN_RESOURCES_LIBRARIES_} PARENT_SCOPE) # override
-	
 	macro(_ADD_PROPERTY_ _BR_PROPERTY_ _BR_PROXY_VAR_)
 		get_property(_BR_PROPERTY_DEFINED_
 			TARGET ${_TARGET_NAME_}