This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch feature/remove_dfi_dep in repository https://gitbox.apache.org/repos/asf/celix.git
commit 82c176451ad595e51c9babe1d3e07c69698b76dd Author: PengZheng <[email protected]> AuthorDate: Wed Feb 1 14:41:50 2023 +0800 Remove the framework's dependence on dfi. --- bundles/cxx_remote_services/integration/gtest/CMakeLists.txt | 2 +- bundles/pubsub/integration/CMakeLists.txt | 2 +- bundles/pubsub/pubsub_utils/CMakeLists.txt | 2 +- .../remote_service_admin_shm_v2/rsa_shm/gtest/CMakeLists.txt | 1 + bundles/remote_services/rsa_rpc_json/gtest/CMakeLists.txt | 1 + libs/framework/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt b/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt index f5ce1622..2d49d627 100644 --- a/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt +++ b/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt @@ -18,7 +18,7 @@ add_executable(test_cxx_remote_services_integration src/RemoteServicesIntegrationTestSuite.cc ) -target_link_libraries(test_cxx_remote_services_integration PRIVATE Celix::framework Celix::Promises Celix::PushStreams Celix::shell_api ZeroMQ::ZeroMQ czmq::czmq GTest::gtest GTest::gtest_main) +target_link_libraries(test_cxx_remote_services_integration PRIVATE Celix::framework Celix::dfi Celix::Promises Celix::PushStreams Celix::shell_api ZeroMQ::ZeroMQ czmq::czmq GTest::gtest GTest::gtest_main) target_include_directories(test_cxx_remote_services_integration PRIVATE ../include) #Add ICalculator add_celix_bundle_dependencies(test_cxx_remote_services_integration diff --git a/bundles/pubsub/integration/CMakeLists.txt b/bundles/pubsub/integration/CMakeLists.txt index 58aa6eaf..87d79e69 100644 --- a/bundles/pubsub/integration/CMakeLists.txt +++ b/bundles/pubsub/integration/CMakeLists.txt @@ -346,7 +346,7 @@ if (PUBSUB_INTEGRATION) pubsub_tst pubsub_serializer ) - target_link_libraries(pubsub_websocket_v2_tests PRIVATE Celix::pubsub_api jansson::jansson civetweb_shared GTest::gtest GTest::gtest_main) + target_link_libraries(pubsub_websocket_v2_tests PRIVATE Celix::pubsub_api Celix::dfi jansson::jansson civetweb_shared GTest::gtest GTest::gtest_main) target_include_directories(pubsub_websocket_v2_tests SYSTEM PRIVATE gtest) add_test(NAME pubsub_websocket_v2_tests COMMAND pubsub_websocket_v2_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_websocket_v2_tests,CONTAINER_LOC>) setup_target_for_coverage(pubsub_websocket_v2_tests SCAN_DIR ..) diff --git a/bundles/pubsub/pubsub_utils/CMakeLists.txt b/bundles/pubsub/pubsub_utils/CMakeLists.txt index 9b0d874b..d34ba631 100644 --- a/bundles/pubsub/pubsub_utils/CMakeLists.txt +++ b/bundles/pubsub/pubsub_utils/CMakeLists.txt @@ -27,7 +27,7 @@ set_target_properties(pubsub_utils PROPERTIES OUTPUT_NAME "celix_pubsub_utils") target_include_directories(pubsub_utils PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> ) -target_link_libraries(pubsub_utils PUBLIC Celix::framework Celix::pubsub_api Celix::log_helper Celix::shell_api) +target_link_libraries(pubsub_utils PUBLIC Celix::framework Celix::dfi Celix::pubsub_api Celix::log_helper Celix::shell_api) target_link_libraries(pubsub_utils PRIVATE Celix::pubsub_spi) celix_deprecated_utils_headers(pubsub_utils) 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 77569041..e499fb0f 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 @@ -31,6 +31,7 @@ target_link_libraries(test_rsa_shm PRIVATE calculator_api Celix::shell_api Celix::framework + Celix::dfi libuuid::libuuid GTest::gtest GTest::gtest_main diff --git a/bundles/remote_services/rsa_rpc_json/gtest/CMakeLists.txt b/bundles/remote_services/rsa_rpc_json/gtest/CMakeLists.txt index cfd9eec6..16418e86 100644 --- a/bundles/remote_services/rsa_rpc_json/gtest/CMakeLists.txt +++ b/bundles/remote_services/rsa_rpc_json/gtest/CMakeLists.txt @@ -31,6 +31,7 @@ target_link_libraries(test_rsa_json_rpc PRIVATE Celix::rsa_common libuuid::libuuid jansson::jansson + Celix::dfi Celix::framework Celix::shell_api GTest::gtest diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt index d2b2cd39..506bf077 100644 --- a/libs/framework/CMakeLists.txt +++ b/libs/framework/CMakeLists.txt @@ -44,7 +44,7 @@ target_compile_options(framework PRIVATE -DUSE_FILE32API) target_compile_options(framework PRIVATE -Wno-deprecated-declarations) #note part of the api is deprecated, ignore this warning on own api set_target_properties(framework PROPERTIES "SOVERSION" ${CELIX_MAJOR}) -target_link_libraries(framework PUBLIC Celix::utils Celix::dfi ${CELIX_OPTIONAL_EXTRA_LIBS}) +target_link_libraries(framework PUBLIC Celix::utils ${CELIX_OPTIONAL_EXTRA_LIBS}) target_link_libraries(framework PUBLIC libuuid::libuuid CURL::libcurl ZLIB::ZLIB) target_link_libraries(framework PRIVATE ${CMAKE_DL_LIBS})
