This is an automated email from the ASF dual-hosted git repository.

pengzheng pushed a commit to branch hotfix/cmake_dep_management
in repository https://gitbox.apache.org/repos/asf/celix.git

commit a622ed4ab394046d3ed1f77d64eb1d832d6b312f
Author: PengZheng <[email protected]>
AuthorDate: Tue Dec 13 10:54:18 2022 +0800

    Fix bundle dependency management in `celix_target_bundle_set_definition`.
---
 cmake/cmake_celix/Generic.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/cmake_celix/Generic.cmake b/cmake/cmake_celix/Generic.cmake
index 59bc7b3a..1c2c4dae 100644
--- a/cmake/cmake_celix/Generic.cmake
+++ b/cmake/cmake_celix/Generic.cmake
@@ -231,6 +231,7 @@ function(celix_target_bundle_set_definition)
     foreach(BUNDLE IN LISTS BUNDLES_LIST)
         if (TARGET ${BUNDLE})
             celix_get_bundle_file(${BUNDLE} BUNDLE_FILE)
+            add_celix_bundle_dependencies(${TARGET_NAME} ${BUNDLE})
         elseif (IS_ABSOLUTE ${BUNDLE} AND EXISTS ${BUNDLE})
             set(BUNDLE_FILE ${BUNDLE})
         else()
@@ -242,7 +243,6 @@ function(celix_target_bundle_set_definition)
         else ()
             set(BUNDLES "${BUNDLE_FILE}")
         endif ()
-        add_celix_bundle_dependencies(${TARGET_NAME} ${BUNDLE_TARGET_NAME})
     endforeach()
 
     target_compile_definitions(${TARGET_NAME} PRIVATE 
${BUNDLE_SET_NAME}=\"${BUNDLES}\")

Reply via email to