Skip to content

Commit 2f5de5d

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 575136e commit 2f5de5d

2 files changed

Lines changed: 0 additions & 15 deletions

File tree

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
@@ -785,14 +785,6 @@ add_subdirectory(ext EXCLUDE_FROM_ALL)
785785
propagate_changed_variables_to_parent_scope()
786786

787787
nbl_install_headers("${NABLA_HEADERS_PUBLIC}")
788-
nbl_install_file_spec("${NBL_ROOT_PATH_BINARY}/include/nbl/builtin/builtinResources.h" "nbl/builtin")
789-
790-
if(NBL_EMBED_BUILTIN_RESOURCES)
791-
nbl_install_builtin_resources(nblBuiltinResourceData)
792-
nbl_install_builtin_resources(spirvBuiltinResourceData)
793-
nbl_install_builtin_resources(boostBuiltinResourceData)
794-
endif()
795-
796788
set_target_properties(Nabla PROPERTIES DEBUG_POSTFIX _debug)
797789
set_target_properties(Nabla PROPERTIES RELWITHDEBINFO_POSTFIX _relwithdebinfo)
798790

0 commit comments

Comments
 (0)