This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/rename_zmq_and_jansson_targets_to_align_with_conan in repository https://gitbox.apache.org/repos/asf/celix.git
commit 3f93d42931ac3bc77ebc526139131048e83824e5 Author: Pepijn Noltes <[email protected]> AuthorDate: Mon Apr 4 18:58:51 2022 +0200 Updates FindJansson.cmake to a lower case package name. Conan generates a Findjansson.cmake (lower case), so the embedded FindJansson.cmake is updated to align with this. --- bundles/http_admin/gtest/CMakeLists.txt | 2 +- bundles/pubsub/examples/CMakeLists.txt | 8 ++++---- bundles/pubsub/integration/CMakeLists.txt | 16 ++++++++-------- bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt | 2 +- bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt | 2 +- bundles/pubsub/pubsub_discovery/CMakeLists.txt | 2 +- bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt | 4 ++-- bundles/pubsub/pubsub_serializer_json/CMakeLists.txt | 2 +- bundles/remote_services/discovery_etcd/CMakeLists.txt | 2 +- .../remote_service_admin_dfi/CMakeLists.txt | 2 +- bundles/remote_services/topology_manager/CMakeLists.txt | 2 +- cmake/Modules/{FindJansson.cmake => Findjansson.cmake} | 0 libs/dfi/CMakeLists.txt | 2 +- libs/etcdlib/CMakeLists.txt | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/bundles/http_admin/gtest/CMakeLists.txt b/bundles/http_admin/gtest/CMakeLists.txt index 93e2fb6b..afc17329 100644 --- a/bundles/http_admin/gtest/CMakeLists.txt +++ b/bundles/http_admin/gtest/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -find_package(Jansson REQUIRED) +find_package(jansson REQUIRED) add_celix_bundle(http_admin_sut #"Vanilla" bundle which is under test diff --git a/bundles/pubsub/examples/CMakeLists.txt b/bundles/pubsub/examples/CMakeLists.txt index 205f94c5..94dc90f0 100644 --- a/bundles/pubsub/examples/CMakeLists.txt +++ b/bundles/pubsub/examples/CMakeLists.txt @@ -22,7 +22,7 @@ if (PUBSUB_EXAMPLES) find_program(ETCD_CMD NAMES etcd) find_program(XTERM_CMD NAMES xterm) - find_package(Jansson REQUIRED) + find_package(jansson REQUIRED) set(PUBSUB_CONTAINER_LIBS jansson::jansson Celix::dfi) @@ -176,10 +176,10 @@ if (PUBSUB_EXAMPLES) endif() if (BUILD_PUBSUB_PSA_ZMQ) - find_package(ZMQ REQUIRED) - find_package(CZMQ REQUIRED) + find_package(ZeroMQ REQUIRED) + find_package(czmq REQUIRED) - set(PUBSUB_CONTAINER_LIBS ${PUBSUB_CONTAINER_LIBS} ZMQ::lib CZMQ::lib ${OPTIONAL_OPENSSL_LIB}) + set(PUBSUB_CONTAINER_LIBS ${PUBSUB_CONTAINER_LIBS} ZeroMQ::ZeroMQ czmq::czmq ${OPTIONAL_OPENSSL_LIB}) if (BUILD_PUBSUB_PSA_TCP AND BUILD_PUBSUB_PSA_UDP_MC) # Dynamic ZMQ / UDP / TCP admin diff --git a/bundles/pubsub/integration/CMakeLists.txt b/bundles/pubsub/integration/CMakeLists.txt index fe775e18..eaa2994b 100644 --- a/bundles/pubsub/integration/CMakeLists.txt +++ b/bundles/pubsub/integration/CMakeLists.txt @@ -17,7 +17,7 @@ celix_subproject(PUBSUB_INTEGRATION "Option to build the pubsub integration" ON DEPS SHELL SHELL_TUI) if (PUBSUB_INTEGRATION) - find_package(Jansson REQUIRED) + find_package(jansson REQUIRED) add_celix_bundle(pubsub_endpoint_sut #"Vanilla" bundle which is under test @@ -376,8 +376,8 @@ if (PUBSUB_INTEGRATION) endif() if (BUILD_PUBSUB_PSA_ZMQ) - find_package(ZMQ REQUIRED) - find_package(CZMQ REQUIRED) + find_package(ZeroMQ REQUIRED) + find_package(czmq REQUIRED) add_celix_container(pubsub_zmq_v2_tests USE_CONFIG #ensures that a config.properties will be created with the launch bundles. @@ -396,7 +396,7 @@ if (PUBSUB_INTEGRATION) pubsub_serializer ) - target_link_libraries(pubsub_zmq_v2_tests PRIVATE Celix::pubsub_api Celix::dfi ZMQ::lib CZMQ::lib GTest::gtest GTest::gtest_main) + target_link_libraries(pubsub_zmq_v2_tests PRIVATE Celix::pubsub_api Celix::dfi ZeroMQ::ZeroMQ czmq::czmq GTest::gtest GTest::gtest_main) target_include_directories(pubsub_zmq_v2_tests SYSTEM PRIVATE gtest) add_test(NAME pubsub_zmq_v2_tests COMMAND pubsub_zmq_v2_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_zmq_v2_tests,CONTAINER_LOC>) setup_target_for_coverage(pubsub_zmq_v2_tests SCAN_DIR ..) @@ -421,7 +421,7 @@ if (PUBSUB_INTEGRATION) pubsub_serializer ) - target_link_libraries(pubsub_zmq_v2_zerocopy_tests PRIVATE Celix::pubsub_api Celix::dfi ZMQ::lib CZMQ::lib GTest::gtest GTest::gtest_main) + target_link_libraries(pubsub_zmq_v2_zerocopy_tests PRIVATE Celix::pubsub_api Celix::dfi ZeroMQ::ZeroMQ czmq::czmq GTest::gtest GTest::gtest_main) target_include_directories(pubsub_zmq_v2_zerocopy_tests SYSTEM PRIVATE gtest) add_test(NAME pubsub_zmq_v2_zerocopy_tests COMMAND pubsub_zmq_v2_zerocopy_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_zmq_v2_zerocopy_tests,CONTAINER_LOC>) @@ -442,7 +442,7 @@ if (PUBSUB_INTEGRATION) ) target_compile_definitions(pstm_deadlock_zmq_v2_test PRIVATE -DDEADLOCK_SUT_BUNDLE_FILE=\"${DEADLOCK_SUT_BUNDLE_FILE}\") - target_link_libraries(pstm_deadlock_zmq_v2_test PRIVATE Celix::pubsub_api GTest::gtest GTest::gtest_main Celix::dfi ZMQ::lib CZMQ::lib) + target_link_libraries(pstm_deadlock_zmq_v2_test PRIVATE Celix::pubsub_api GTest::gtest GTest::gtest_main Celix::dfi ZeroMQ::ZeroMQ czmq::czmq) target_include_directories(pstm_deadlock_zmq_v2_test SYSTEM PRIVATE pstm_deadlock_zmq_v2_test) #Note we do not link to bundles, as result (to ensure a bundle zip file is created) an dependency on the bundle is needed. @@ -535,8 +535,8 @@ if (PUBSUB_INTEGRATION) endif () #Linking against zmq if present - if (TARGET ZMQ::lib AND TARGET CZMQ::lib) - target_link_libraries(${TEST_TARGET_NAME} PRIVATE ZMQ::lib CZMQ::lib) + if (TARGET ZeroMQ::ZeroMQ AND TARGET czmq::czmq) + target_link_libraries(${TEST_TARGET_NAME} PRIVATE ZeroMQ::ZeroMQ czmq::czmq) endif () endfunction() diff --git a/bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt b/bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt index 1e5148dc..442c337b 100644 --- a/bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt @@ -17,7 +17,7 @@ celix_subproject(PUBSUB_PSA_UDP_MC "Build UDP MC PubSub Admin" ON) if (PUBSUB_PSA_UDP_MC) - find_package(Jansson REQUIRED) + find_package(jansson REQUIRED) add_celix_bundle(celix_pubsub_admin_udp_multicast BUNDLE_SYMBOLICNAME "apache_celix_pubsub_admin_udp_multicast" diff --git a/bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt b/bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt index 15ad395a..8a59ffa7 100644 --- a/bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt @@ -17,7 +17,7 @@ celix_subproject(PUBSUB_PSA_WS "Build WebSocket PubSub Admin" ON DEPS HTTP_ADMIN) if (PUBSUB_PSA_WS) - find_package(Jansson REQUIRED) + find_package(jansson REQUIRED) find_package(UUID REQUIRED) add_celix_bundle(celix_pubsub_admin_websocket diff --git a/bundles/pubsub/pubsub_discovery/CMakeLists.txt b/bundles/pubsub/pubsub_discovery/CMakeLists.txt index ebccd0d7..c9f02614 100644 --- a/bundles/pubsub/pubsub_discovery/CMakeLists.txt +++ b/bundles/pubsub/pubsub_discovery/CMakeLists.txt @@ -18,7 +18,7 @@ celix_subproject(PUBSUB_DISCOVERY_ETCD "Option to enable building the PubSub Discovery (ETCD) bundle" ON DEPS CELIX_ETCDLIB) if (PUBSUB_DISCOVERY_ETCD) find_package(CURL REQUIRED) - find_package(Jansson REQUIRED) + find_package(jansson REQUIRED) add_celix_bundle(celix_pubsub_discovery_etcd BUNDLE_SYMBOLICNAME "apache_celix_pubsub_discovery_etcd" diff --git a/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt b/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt index 9b57bc43..af41f33b 100644 --- a/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt +++ b/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -find_package(Jansson REQUIRED) +find_package(jansson REQUIRED) add_celix_bundle(celix_pubsub_serializer_avrobin BUNDLE_SYMBOLICNAME "apache_celix_pubsub_serializer_avrobin" @@ -40,4 +40,4 @@ add_library(Celix::celix_pubsub_serializer_avrobin ALIAS celix_pubsub_serializer if (ENABLE_TESTING) add_subdirectory(gtest) -endif(ENABLE_TESTING) \ No newline at end of file +endif(ENABLE_TESTING) diff --git a/bundles/pubsub/pubsub_serializer_json/CMakeLists.txt b/bundles/pubsub/pubsub_serializer_json/CMakeLists.txt index 0263ceba..ad7d465c 100644 --- a/bundles/pubsub/pubsub_serializer_json/CMakeLists.txt +++ b/bundles/pubsub/pubsub_serializer_json/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -find_package(Jansson REQUIRED) +find_package(jansson REQUIRED) add_celix_bundle(celix_pubsub_serializer_json diff --git a/bundles/remote_services/discovery_etcd/CMakeLists.txt b/bundles/remote_services/discovery_etcd/CMakeLists.txt index adc43f18..15043386 100644 --- a/bundles/remote_services/discovery_etcd/CMakeLists.txt +++ b/bundles/remote_services/discovery_etcd/CMakeLists.txt @@ -19,7 +19,7 @@ celix_subproject(RSA_DISCOVERY_ETCD "Option to enable building the Discovery (ET if (RSA_DISCOVERY_ETCD) find_package(CURL REQUIRED) find_package(LibXml2 REQUIRED) - find_package(Jansson REQUIRED) + find_package(jansson REQUIRED) add_celix_bundle(rsa_discovery_etcd VERSION 0.9.0 diff --git a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt index 3627b294..5744e554 100644 --- a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt +++ b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt @@ -18,7 +18,7 @@ celix_subproject(RSA_REMOTE_SERVICE_ADMIN_DFI "Option to enable building the Remote Service Admin Service DFI" ON) if (RSA_REMOTE_SERVICE_ADMIN_DFI) find_package(CURL REQUIRED) - find_package(Jansson REQUIRED) + find_package(jansson REQUIRED) find_package(UUID REQUIRED) add_celix_bundle(rsa_dfi diff --git a/bundles/remote_services/topology_manager/CMakeLists.txt b/bundles/remote_services/topology_manager/CMakeLists.txt index 52ad5fa8..5b7fed1d 100644 --- a/bundles/remote_services/topology_manager/CMakeLists.txt +++ b/bundles/remote_services/topology_manager/CMakeLists.txt @@ -34,7 +34,7 @@ install_celix_bundle(rsa_topology_manager EXPORT celix COMPONENT rsa) add_library(Celix::rsa_topology_manager ALIAS rsa_topology_manager) if (ENABLE_TESTING AND BUILD_RSA_REMOTE_SERVICE_ADMIN_DFI) - find_package(Jansson REQUIRED) + find_package(jansson REQUIRED) add_subdirectory(tms_tst) endif () diff --git a/cmake/Modules/FindJansson.cmake b/cmake/Modules/Findjansson.cmake similarity index 100% rename from cmake/Modules/FindJansson.cmake rename to cmake/Modules/Findjansson.cmake diff --git a/libs/dfi/CMakeLists.txt b/libs/dfi/CMakeLists.txt index f5910bb2..fa59d014 100644 --- a/libs/dfi/CMakeLists.txt +++ b/libs/dfi/CMakeLists.txt @@ -16,7 +16,7 @@ # under the License. find_package(FFI REQUIRED) -find_package(Jansson REQUIRED) +find_package(jansson REQUIRED) set(SOURCES src/dyn_common.c diff --git a/libs/etcdlib/CMakeLists.txt b/libs/etcdlib/CMakeLists.txt index 77c2a66b..2103a5f4 100644 --- a/libs/etcdlib/CMakeLists.txt +++ b/libs/etcdlib/CMakeLists.txt @@ -37,7 +37,7 @@ if (NOT COMMAND celix_subproject) set(ETCDLIB_CMP ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}) find_package(CURL REQUIRED) - find_package(Jansson REQUIRED) + find_package(jansson REQUIRED) if (NOT TARGET CURL::libcurl) #Note more recent curl will create CURL::libcurl target
