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 f02b65157df6b8ea9e943025c8ecbdbca579bf58 Author: Pepijn Noltes <[email protected]> AuthorDate: Mon Apr 4 18:56:15 2022 +0200 Updates FindZMQ.cmake and FindCZMQ.cmake conform the versions generated by conan. --- bundles/cxx_remote_services/integration/CMakeLists.txt | 10 +++++----- bundles/pubsub/keygen/CMakeLists.txt | 8 ++++---- bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt | 6 +++--- cmake/Modules/{FindZMQ.cmake => FindZeroMQ.cmake} | 8 ++++---- cmake/Modules/{FindCZMQ.cmake => Findczmq.cmake} | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bundles/cxx_remote_services/integration/CMakeLists.txt b/bundles/cxx_remote_services/integration/CMakeLists.txt index 4b8e97b1..de8fcf71 100644 --- a/bundles/cxx_remote_services/integration/CMakeLists.txt +++ b/bundles/cxx_remote_services/integration/CMakeLists.txt @@ -17,8 +17,8 @@ celix_subproject(CXX_RSA_INTEGRATION "Option to build the C++17 Remote Service Admin Service integration" ON DEPS SHELL SHELL_TUI PUBSUB PROMISES PUSHSTREAMS PUBSUB_PSA_ZMQ PUBSUB_DISCOVERY_ETCD) if (CXX_RSA_INTEGRATION) - find_package(ZMQ REQUIRED) - find_package(CZMQ REQUIRED) + find_package(ZeroMQ REQUIRED) + find_package(czmq REQUIRED) add_celix_bundle(TestExportImportRemoteServiceFactory SOURCES src/TestExportImportRemoteServiceFactory.cc ) @@ -71,7 +71,7 @@ if (CXX_RSA_INTEGRATION) CalculatorProvider ) - target_link_libraries(RemoteCalculatorProvider PRIVATE ZMQ::lib CZMQ::lib) + target_link_libraries(RemoteCalculatorProvider PRIVATE ZeroMQ::ZeroMQ czmq::czmq) add_celix_container(RemoteCalculatorConsumer GROUP rsa @@ -95,5 +95,5 @@ if (CXX_RSA_INTEGRATION) CalculatorConsumer ) - target_link_libraries(RemoteCalculatorConsumer PRIVATE ZMQ::lib CZMQ::lib) -endif() \ No newline at end of file + target_link_libraries(RemoteCalculatorConsumer PRIVATE ZeroMQ::ZeroMQ czmq::czmq) +endif() diff --git a/bundles/pubsub/keygen/CMakeLists.txt b/bundles/pubsub/keygen/CMakeLists.txt index 51730a7b..0f8ecc89 100644 --- a/bundles/pubsub/keygen/CMakeLists.txt +++ b/bundles/pubsub/keygen/CMakeLists.txt @@ -17,14 +17,14 @@ if (BUILD_ZMQ_SECURITY) - find_package(ZMQ REQUIRED) - find_package(CZMQ REQUIRED) + find_package(ZeroMQ REQUIRED) + find_package(czmq REQUIRED) find_package(OpenSSL 1.1.0 REQUIRED) add_executable(makecert makecert.c) - target_link_libraries(makecert CZMQ::lib) + target_link_libraries(makecert czmq::czmq) add_executable(ed_file ed_file.c) - target_link_libraries(ed_file PUBLIC ZMQ::lib CZMQ::lib OpenSSL::SSL) + target_link_libraries(ed_file PUBLIC ZeroMQ::ZeroMQ czmq::czmq OpenSSL::SSL) endif() diff --git a/bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt b/bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt index daf590e0..a76ccd0d 100644 --- a/bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt @@ -17,8 +17,8 @@ celix_subproject(PUBSUB_PSA_ZMQ "Build ZeroMQ PubSub Admin (LGPL License)" ON) if (PUBSUB_PSA_ZMQ) - find_package(ZMQ REQUIRED) - find_package(CZMQ REQUIRED) + find_package(ZeroMQ REQUIRED) + find_package(czmq REQUIRED) find_package(UUID REQUIRED) set(OPTIONAL_OPENSSL_LIB ) @@ -48,7 +48,7 @@ if (PUBSUB_PSA_ZMQ) target_link_libraries(celix_pubsub_admin_zmq PRIVATE Celix::framework Celix::dfi Celix::log_helper Celix::utils - ZMQ::lib CZMQ::lib ${OPTIONAL_OPENSSL_LIB}) + ZeroMQ::ZeroMQ czmq::czmq ${OPTIONAL_OPENSSL_LIB}) target_link_libraries(celix_pubsub_admin_zmq PRIVATE Celix::shell_api) target_link_libraries(celix_pubsub_admin_zmq PRIVATE Celix::pubsub_spi Celix::pubsub_utils) target_include_directories(celix_pubsub_admin_zmq PRIVATE src) diff --git a/cmake/Modules/FindZMQ.cmake b/cmake/Modules/FindZeroMQ.cmake similarity index 92% rename from cmake/Modules/FindZMQ.cmake rename to cmake/Modules/FindZeroMQ.cmake index 2c2767ed..aa361970 100644 --- a/cmake/Modules/FindZMQ.cmake +++ b/cmake/Modules/FindZeroMQ.cmake @@ -42,10 +42,10 @@ find_package_handle_standard_args(ZMQ DEFAULT_MSG mark_as_advanced(ZMQ_INCLUDE_DIR ZMQ_LIBRARY ) -if (ZMQ_FOUND AND NOT TARGET ZMQ::lib) - add_library(ZMQ::lib SHARED IMPORTED) - set_target_properties(ZMQ::lib PROPERTIES +if (ZMQ_FOUND AND NOT TARGET ZeroMQ::ZeroMQ + add_library(ZeroMQ::ZeroMQ SHARED IMPORTED) + set_target_properties(ZeroMQ::ZeroMQ PROPERTIES IMPORTED_LOCATION "${ZMQ_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES "${ZMQ_INCLUDE_DIR}" ) -endif () \ No newline at end of file +endif () diff --git a/cmake/Modules/FindCZMQ.cmake b/cmake/Modules/Findczmq.cmake similarity index 93% rename from cmake/Modules/FindCZMQ.cmake rename to cmake/Modules/Findczmq.cmake index b810ff54..2f75dc70 100644 --- a/cmake/Modules/FindCZMQ.cmake +++ b/cmake/Modules/Findczmq.cmake @@ -42,9 +42,9 @@ find_package_handle_standard_args(CZMQ DEFAULT_MSG mark_as_advanced(CZMQ_INCLUDE_DIR CZMQ_LIBRARY) -if (CZMQ_FOUND AND NOT TARGET CZMQ::lib) - add_library(CZMQ::lib SHARED IMPORTED) - set_target_properties(CZMQ::lib PROPERTIES +if (CZMQ_FOUND AND NOT TARGET czmq::czmq) + add_library(czmq::czmq SHARED IMPORTED) + set_target_properties(czmq::czmq PROPERTIES IMPORTED_LOCATION "${CZMQ_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES "${CZMQ_INCLUDE_DIR}" )
