Skip to content

Commit 055aa5d

Browse files
committed
correct NBL_ADJUST_FOLDERS and update references
1 parent d6fc177 commit 055aa5d

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,4 +285,5 @@ add_subdirectory(artifacts)
285285
option(NBL_CPACK_INCLUDE_EXAMPLES "CPack with examples and media" ON)
286286
include(cpack/package)
287287
include(build/info)
288-
export(TARGETS ${_NBL_3RDPARTY_TARGETS_} Nabla NAMESPACE Nabla:: APPEND FILE ${NBL_ROOT_PATH_BINARY}/NablaExport.cmake)
288+
export(TARGETS ${_NBL_3RDPARTY_TARGETS_} Nabla NAMESPACE Nabla:: APPEND FILE ${NBL_ROOT_PATH_BINARY}/NablaExport.cmake)
289+
NBL_ADJUST_FOLDERS(nabla)

cmake/common.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,9 +1221,9 @@ function(NBL_ADJUST_FOLDERS NS)
12211221
get_target_property(NBL_FOLDER ${T} FOLDER)
12221222

12231223
if(NBL_FOLDER)
1224-
set_target_properties(${T} PROPERTIES FOLDER "nabla/${NS}/${NBL_FOLDER}")
1224+
set_target_properties(${T} PROPERTIES FOLDER "${NS}/${NBL_FOLDER}")
12251225
else()
1226-
set_target_properties(${T} PROPERTIES FOLDER "nabla/${NS}")
1226+
set_target_properties(${T} PROPERTIES FOLDER "${NS}")
12271227
endif()
12281228
endforeach()
12291229
endfunction()

src/nbl/ext/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,6 @@ if(NBL_BUILD_TEXT_RENDERING)
7777
add_subdirectory(TextRendering)
7878
endif()
7979

80-
propagate_changed_variables_to_parent_scope()
80+
propagate_changed_variables_to_parent_scope()
81+
82+
NBL_ADJUST_FOLDERS(ext)

0 commit comments

Comments
 (0)