This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git
commit 91fff325e328b3b2485940d128f5664cf60342a6 Merge: 39dbc799 fba37f8d Author: Pepijn Noltes <[email protected]> AuthorDate: Wed Apr 6 20:00:54 2022 +0200 Merge pull request #409 from apache/feature/rename_zmq_and_jansson_targets_to_align_with_conan Feature/rename zmq and jansson targets to align with conan .github/workflows/macos.yml | 1 + .github/workflows/ubuntu.yml | 1 + CMakeLists.txt | 4 +-- .../cxx_remote_services/integration/CMakeLists.txt | 10 +++--- .../integration/gtest/CMakeLists.txt | 2 +- bundles/http_admin/gtest/CMakeLists.txt | 2 +- bundles/pubsub/examples/CMakeLists.txt | 8 ++--- bundles/pubsub/integration/CMakeLists.txt | 16 ++++----- bundles/pubsub/keygen/CMakeLists.txt | 8 ++--- bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt | 2 +- .../pubsub/pubsub_admin_websocket/CMakeLists.txt | 2 +- bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt | 6 ++-- bundles/pubsub/pubsub_discovery/CMakeLists.txt | 2 +- .../pubsub_serializer_avrobin/CMakeLists.txt | 4 +-- .../pubsub/pubsub_serializer_json/CMakeLists.txt | 2 +- .../remote_services/discovery_etcd/CMakeLists.txt | 2 +- .../remote_service_admin_dfi/CMakeLists.txt | 2 +- .../topology_manager/CMakeLists.txt | 2 +- cmake/Modules/{FindZMQ.cmake => FindZeroMQ.cmake} | 38 +++++++++++----------- cmake/Modules/{FindCZMQ.cmake => Findczmq.cmake} | 18 +++++----- .../Modules/Findjansson.cmake | 4 +-- libs/dfi/CMakeLists.txt | 2 +- libs/etcdlib/CMakeLists.txt | 2 +- .../etcdlib/cmake/Findjansson.cmake | 14 ++++---- 24 files changed, 78 insertions(+), 76 deletions(-)
