Skip to content

Commit 374257c

Browse files
committed
wipe installation rules of builtin resource headers, they are not included in headers, not exported and its private interface actually
they might be installed but then shall be exported and it requires polishing what content they include as they should hide all info about keys to keep our install single prefix
1 parent 9d99330 commit 374257c

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

cmake/common.cmake

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,6 @@ function(nbl_install_media _FILE)
350350
nbl_install_lib_spec("${_FILE}" "")
351351
endfunction()
352352

353-
function(nbl_install_builtin_resources _TARGET_)
354-
get_target_property(_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_ ${_TARGET_} BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY)
355-
get_target_property(_BUILTIN_RESOURCES_HEADERS_ ${_TARGET_} BUILTIN_RESOURCES_HEADERS)
356-
357-
nbl_install_headers_spec("${_BUILTIN_RESOURCES_HEADERS_}" "${_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_}")
358-
endfunction()
359-
360353
function(NBL_TEST_MODULE_INSTALL_FILE _NBL_FILEPATH_)
361354
file(RELATIVE_PATH _NBL_REL_INSTALL_DEST_ "${NBL_ROOT_PATH}" "${_NBL_FILEPATH_}")
362355
cmake_path(GET _NBL_REL_INSTALL_DEST_ PARENT_PATH _NBL_REL_INSTALL_DEST_)

src/nbl/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -780,14 +780,6 @@ add_subdirectory(ext EXCLUDE_FROM_ALL)
780780
propagate_changed_variables_to_parent_scope()
781781

782782
nbl_install_headers("${NABLA_HEADERS_PUBLIC}")
783-
nbl_install_file_spec("${NBL_ROOT_PATH_BINARY}/include/nbl/builtin/builtinResources.h" "nbl/builtin")
784-
785-
if(NBL_EMBED_BUILTIN_RESOURCES)
786-
nbl_install_builtin_resources(nblBuiltinResourceData)
787-
nbl_install_builtin_resources(spirvBuiltinResourceData)
788-
nbl_install_builtin_resources(boostBuiltinResourceData)
789-
endif()
790-
791783
set_target_properties(Nabla PROPERTIES DEBUG_POSTFIX _debug)
792784
set_target_properties(Nabla PROPERTIES RELWITHDEBINFO_POSTFIX _relwithdebinfo)
793785

0 commit comments

Comments
 (0)