Skip to content

Commit 8a7dbe8

Browse files
committed
correct ext project creation and request nblBuiltinResourceData properties only on NBL_EMBED_BUILTIN_RESOURCES turned on
1 parent d7a7a3b commit 8a7dbe8

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

cmake/common.cmake

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
221221
add_dependencies(${LIB_NAME} Nabla)
222222

223223
get_target_property(_NBL_NABLA_TARGET_BINARY_DIR_ Nabla BINARY_DIR)
224-
get_target_property(_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_ nblBuiltinResourceData BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY)
225224

226225
target_include_directories(${LIB_NAME}
227226
PUBLIC ${_NBL_NABLA_TARGET_BINARY_DIR_}/build/import
@@ -231,9 +230,17 @@ macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
231230
PUBLIC ${CMAKE_SOURCE_DIR}/include
232231
PUBLIC ${CMAKE_SOURCE_DIR}/src
233232
PUBLIC ${CMAKE_SOURCE_DIR}/source/Nabla
234-
PUBLIC ${_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_}
235233
PRIVATE ${LIB_INCLUDES}
236234
)
235+
236+
if(NBL_EMBED_BUILTIN_RESOURCES)
237+
get_target_property(_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_ nblBuiltinResourceData BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY)
238+
239+
target_include_directories(${LIB_NAME}
240+
PUBLIC ${_BUILTIN_RESOURCES_INCLUDE_SEARCH_DIRECTORY_}
241+
)
242+
endif()
243+
237244
add_dependencies(${LIB_NAME} Nabla)
238245
target_link_libraries(${LIB_NAME} PUBLIC Nabla)
239246
target_compile_options(${LIB_NAME} PUBLIC ${LIB_OPTIONS})

0 commit comments

Comments
 (0)