[celix] branch feature/error_injector_ergonomics updated: Make bundles loadable without celix_bundle_private_libs.

[pengzheng]

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

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


The following commit(s) were added to 
refs/heads/feature/error_injector_ergonomics by this push:
     new bdbd660f Make bundles loadable without celix_bundle_private_libs.
bdbd660f is described below

commit bdbd660f389e6ed0e57137ca286be0c2f7e3c7f6
Author: PengZheng <howto...@gmail.com>
AuthorDate: Fri May 5 17:47:41 2023 +0800

    Make bundles loadable without celix_bundle_private_libs.
---
 libs/framework/gtest/CMakeLists.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libs/framework/gtest/CMakeLists.txt 
b/libs/framework/gtest/CMakeLists.txt
index 91cdd91c..c05fe4f5 100644
--- a/libs/framework/gtest/CMakeLists.txt
+++ b/libs/framework/gtest/CMakeLists.txt
@@ -59,7 +59,9 @@ set(CELIX_FRAMEWORK_TEST_SOURCES
 )
 
 add_executable(test_framework ${CELIX_FRAMEWORK_TEST_SOURCES})
-target_link_libraries(test_framework PRIVATE framework_cut CURL::libcurl 
GTest::gtest GTest::gtest_main)
+# framework_cut makes error injector work
+# Celix::framework makes bundles loadable (otherwise we need an copy of 
framework in each bundle, celix_bundle_private_libs)
+target_link_libraries(test_framework PRIVATE framework_cut Celix::framework 
CURL::libcurl GTest::gtest GTest::gtest_main)
 celix_deprecated_framework_headers(test_framework)
 
 
@@ -135,6 +137,7 @@ if (LINKER_WRAP_SUPPORTED)
     celix_deprecated_utils_headers(test_framework_with_ei)
     target_link_libraries(test_framework_with_ei PRIVATE
             framework_cut
+            Celix::framework
             Celix::malloc_ei
             Celix::utils_ei
             Celix::asprintf_ei
@@ -153,7 +156,7 @@ if (ENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11)
     add_executable(test_dep_man_with_cxx11
             src/DependencyManagerTestSuite.cc
             )
-    target_link_libraries(test_dep_man_with_cxx11 PRIVATE framework_cut 
CURL::libcurl GTest::gtest GTest::gtest_main)
+    target_link_libraries(test_dep_man_with_cxx11 PRIVATE framework_cut 
Celix::framework CURL::libcurl GTest::gtest GTest::gtest_main)
     target_compile_definitions(test_dep_man_with_cxx11 PRIVATE
             SIMPLE_CXX_DEP_MAN_BUNDLE_LOC="${SIMPLE_CXX_DEP_MAN_BUNDLE_LOC}"
             )
@@ -172,7 +175,7 @@ if (ENABLE_TESTING_FOR_CXX14)
     set(CMAKE_CXX_STANDARD 14)
 
     add_executable(test_framework_with_cxx14 ${CELIX_FRAMEWORK_TEST_SOURCES})
-    target_link_libraries(test_framework_with_cxx14 PRIVATE framework_cut 
CURL::libcurl GTest::gtest GTest::gtest_main)
+    target_link_libraries(test_framework_with_cxx14 PRIVATE framework_cut 
Celix::framework CURL::libcurl GTest::gtest GTest::gtest_main)
     celix_deprecated_utils_headers(test_framework_with_cxx14)
     celix_deprecated_framework_headers(test_framework_with_cxx14)
     add_celix_bundle_dependencies(test_framework_with_cxx14