diff --git a/bundles/pubsub/pubsub_spi/CMakeLists.txt b/bundles/pubsub/pubsub_spi/CMakeLists.txt index e3934409d..b88c8f1b1 100644 --- a/bundles/pubsub/pubsub_spi/CMakeLists.txt +++ b/bundles/pubsub/pubsub_spi/CMakeLists.txt @@ -31,6 +31,8 @@ target_link_libraries(pubsub_spi PUBLIC Celix::framework Celix::pubsub_api) target_link_libraries(pubsub_spi PUBLIC Celix::pubsub_utils libuuid::libuuid) celix_deprecated_utils_headers(pubsub_spi) celix_deprecated_framework_headers(pubsub_spi) +celix_target_hide_symbols(pubsub_spi) + add_library(Celix::pubsub_spi ALIAS pubsub_spi) install(TARGETS pubsub_spi EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT pubsub diff --git a/bundles/pubsub/pubsub_utils/CMakeLists.txt b/bundles/pubsub/pubsub_utils/CMakeLists.txt index 91fe25234..5cf9c90f2 100644 --- a/bundles/pubsub/pubsub_utils/CMakeLists.txt +++ b/bundles/pubsub/pubsub_utils/CMakeLists.txt @@ -31,6 +31,7 @@ target_link_libraries(pubsub_utils PUBLIC Celix::framework Celix::dfi Celix::pub target_link_libraries(pubsub_utils PRIVATE Celix::pubsub_spi) celix_deprecated_utils_headers(pubsub_utils) celix_deprecated_framework_headers(pubsub_utils) +celix_target_hide_symbols(pubsub_utils) add_library(Celix::pubsub_utils ALIAS pubsub_utils) diff --git a/bundles/remote_services/discovery_zeroconf/gtest/CMakeLists.txt b/bundles/remote_services/discovery_zeroconf/gtest/CMakeLists.txt index 789c16760..9a7ba819b 100644 --- a/bundles/remote_services/discovery_zeroconf/gtest/CMakeLists.txt +++ b/bundles/remote_services/discovery_zeroconf/gtest/CMakeLists.txt @@ -52,7 +52,7 @@ if (LINKER_WRAP_SUPPORTED) target_link_libraries(unit_test_discovery_zeroconf PRIVATE rsa_discovery_zeroconf_cut - Celix::rsa_common + rsa_common_cut Celix::c_rsa_spi Celix::framework Celix::threads_ei diff --git a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt index dda5874e5..dddf7d17b 100644 --- a/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt +++ b/bundles/remote_services/remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt @@ -53,7 +53,7 @@ if (LINKER_WRAP_SUPPORTED) target_link_libraries(unit_test_rsa_shm PRIVATE rsa_shm_cut Celix::c_rsa_spi - Celix::rsa_common + rsa_common_cut Celix::log_helper Celix::framework Celix::threads_ei diff --git a/bundles/remote_services/rsa_common/CMakeLists.txt b/bundles/remote_services/rsa_common/CMakeLists.txt index c06a02e75..d4390bf66 100644 --- a/bundles/remote_services/rsa_common/CMakeLists.txt +++ b/bundles/remote_services/rsa_common/CMakeLists.txt @@ -15,16 +15,20 @@ # specific language governing permissions and limitations # under the License. -add_library(rsa_common STATIC - src/endpoint_description.c - src/export_registration_impl.c - src/import_registration_impl.c - src/remote_interceptors_handler.c) +set(RSA_COMMON_SRC + src/endpoint_description.c + src/export_registration_impl.c + src/import_registration_impl.c + src/remote_interceptors_handler.c + ) + +add_library(rsa_common STATIC ${RSA_COMMON_SRC}) set_target_properties(rsa_common PROPERTIES OUTPUT_NAME "celix_rsa_common") target_include_directories(rsa_common PRIVATE src) target_link_libraries(rsa_common PUBLIC Celix::framework Celix::c_rsa_spi Celix::log_helper) celix_deprecated_utils_headers(rsa_common) celix_deprecated_framework_headers(rsa_common) +celix_target_hide_symbols(rsa_common) install(TARGETS rsa_common EXPORT celix COMPONENT rsa DESTINATION ${CMAKE_INSTALL_LIBDIR}) @@ -32,5 +36,10 @@ install(TARGETS rsa_common EXPORT celix COMPONENT rsa DESTINATION ${CMAKE_INSTAL add_library(Celix::rsa_common ALIAS rsa_common) if (ENABLE_TESTING) + add_library(rsa_common_cut STATIC ${RSA_COMMON_SRC}) + target_include_directories(rsa_common_cut PUBLIC src) + target_link_libraries(rsa_common_cut PUBLIC Celix::framework Celix::c_rsa_spi Celix::log_helper) + celix_deprecated_utils_headers(rsa_common_cut) + celix_deprecated_framework_headers(rsa_common_cut) add_subdirectory(gtest) endif() \ No newline at end of file diff --git a/bundles/remote_services/rsa_common/gtest/CMakeLists.txt b/bundles/remote_services/rsa_common/gtest/CMakeLists.txt index c6dfb2f97..4c6c2410f 100644 --- a/bundles/remote_services/rsa_common/gtest/CMakeLists.txt +++ b/bundles/remote_services/rsa_common/gtest/CMakeLists.txt @@ -21,7 +21,7 @@ if (LINKER_WRAP_SUPPORTED) ) target_link_libraries(unit_test_rsa_common PRIVATE - Celix::rsa_common + rsa_common_cut Celix::rsa_spi Celix::framework Celix::utils diff --git a/bundles/remote_services/rsa_dfi_utils/CMakeLists.txt b/bundles/remote_services/rsa_dfi_utils/CMakeLists.txt index 2526c4446..b45c536d2 100644 --- a/bundles/remote_services/rsa_dfi_utils/CMakeLists.txt +++ b/bundles/remote_services/rsa_dfi_utils/CMakeLists.txt @@ -25,6 +25,7 @@ target_include_directories(rsa_dfi_utils PUBLIC target_include_directories(rsa_dfi_utils PRIVATE src) target_link_libraries(rsa_dfi_utils PUBLIC Celix::framework Celix::log_helper Celix::dfi) celix_deprecated_utils_headers(rsa_dfi_utils) +celix_target_hide_symbols(rsa_dfi_utils) #Setup target aliases to match external usage add_library(Celix::rsa_dfi_utils ALIAS rsa_dfi_utils) diff --git a/bundles/remote_services/rsa_rpc_json/gtest/CMakeLists.txt b/bundles/remote_services/rsa_rpc_json/gtest/CMakeLists.txt index b3d7db693..c94990556 100644 --- a/bundles/remote_services/rsa_rpc_json/gtest/CMakeLists.txt +++ b/bundles/remote_services/rsa_rpc_json/gtest/CMakeLists.txt @@ -49,7 +49,7 @@ if (LINKER_WRAP_SUPPORTED) target_link_libraries(unit_test_rsa_json_rpc PRIVATE rsa_json_rpc_cut Celix::c_rsa_spi - Celix::rsa_common + rsa_common_cut Celix::framework Celix::bundle_ei Celix::malloc_ei diff --git a/bundles/remote_services/thpool/CMakeLists.txt b/bundles/remote_services/thpool/CMakeLists.txt index 1465c0ff5..7545fb298 100644 --- a/bundles/remote_services/thpool/CMakeLists.txt +++ b/bundles/remote_services/thpool/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(thpool STATIC src/thpool.c ) - +celix_target_hide_symbols(thpool) target_include_directories(thpool PUBLIC include) add_library(Celix::thpool ALIAS thpool)