Skip to content

Commit 0433827

Browse files
committed
add LINK_BUILTIN_RESOURCES_TO_TARGET and correct bug in macro, update examples_tests submodule
1 parent 3d753f5 commit 0433827

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

cmake/common.cmake

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,18 @@ function(nbl_install_config_header _CONF_HDR_NAME)
358358
install(FILES ${file_relWithDebInfo} DESTINATION relwithdebinfo/include CONFIGURATIONS RelWithDebInfo)
359359
endfunction()
360360

361+
# links builtin resource target to a target
362+
# @_TARGET_@ is target name builtin resource target will be linked to
363+
# @_BS_TARGET_@ is a builtin resource target
364+
365+
function(LINK_BUILTIN_RESOURCES_TO_TARGET _TARGET_ _BS_TARGET_)
366+
add_dependencies(${EXECUTABLE_NAME} systemTestBuiltinResourceData)
367+
target_link_libraries(${EXECUTABLE_NAME} PUBLIC systemTestBuiltinResourceData)
368+
369+
get_target_property(_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_ ${_BS_TARGET_} BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY)
370+
target_include_directories(${EXECUTABLE_NAME} PUBLIC "${_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_}")
371+
endfunction()
372+
361373
macro(nbl_android_create_apk _TARGET)
362374
get_target_property(TARGET_NAME ${_TARGET} NAME)
363375
# TARGET_NAME_IDENTIFIER is identifier that can be used in code

src/nbl/builtin/utils.cmake

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
4949
string(TOUPPER ${_GUARD_SUFFIX_} _GUARD_SUFFIX_)
5050
string(MAKE_C_IDENTIFIER ${_GUARD_SUFFIX_} _GUARD_SUFFIX_)
5151

52+
set(_OUTPUT_INCLUDE_SEARCH_DIRECTORY_ "${_OUTPUT_INCLUDE_SEARCH_DIRECTORY_}")
5253
set(_OUTPUT_HEADER_DIRECTORY_ "${_OUTPUT_INCLUDE_SEARCH_DIRECTORY_}/${_PATH_PREFIX_}")
5354

5455
file(MAKE_DIRECTORY "${_OUTPUT_HEADER_DIRECTORY_}")
@@ -144,11 +145,12 @@ function(ADD_CUSTOM_BUILTIN_RESOURCES _TARGET_NAME_ _BUNDLE_NAME_ _BUNDLE_SEARCH
144145
PROPERTY ${_BR_PROPERTY_}
145146
DEFINED
146147
)
147-
148+
148149
if(NOT _BR_PROPERTY_DEFINED_)
149-
define_property(TARGET PROPERTY ${_BR_PROPERTY_})
150-
set_target_properties(${_TARGET_NAME_} PROPERTIES ${_BR_PROPERTY_} "${${_BR_PROXY_VAR_}}")
150+
define_property(TARGET PROPERTY ${_BR_PROPERTY_})
151151
endif()
152+
153+
set_target_properties(${_TARGET_NAME_} PROPERTIES ${_BR_PROPERTY_} "${${_BR_PROXY_VAR_}}")
152154

153155
unset(_BR_PROPERTY_DEFINED_)
154156
endmacro()

0 commit comments

Comments
 (0)