This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
from 91fff325 Merge pull request #409 from
apache/feature/rename_zmq_and_jansson_targets_to_align_with_conan
add d608c59a Unify conan autogenerated find modules with Celix's own find
modules.
add a7412f95 Minor indentation adjustment.
new 878791af Merge pull request #411 from
apache/feature/conan_find_module_unification
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CMakeLists.txt | 6 +--
bundles/deployment_admin/CMakeLists.txt | 4 +-
.../example/refining_driver/src/refining_driver.c | 46 +++++++++++-----------
bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt | 4 +-
.../pubsub/pubsub_admin_websocket/CMakeLists.txt | 2 +-
bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt | 2 +-
bundles/pubsub/pubsub_spi/CMakeLists.txt | 2 +-
.../pubsub/pubsub_topology_manager/CMakeLists.txt | 4 +-
.../remote_service_admin_dfi/CMakeLists.txt | 2 +-
.../remote_service_admin_shm/CMakeLists.txt | 2 +-
cmake/CelixConfig.cmake | 12 +++---
cmake/Modules/FindCppUTest.cmake | 23 ++++++-----
cmake/Modules/FindSyslog.cmake | 39 ------------------
cmake/Modules/FindZeroMQ.cmake | 6 +--
cmake/Modules/Findczmq.cmake | 6 +--
cmake/Modules/Findjansson.cmake | 6 +--
cmake/Modules/{FindFFI.cmake => Findlibffi.cmake} | 14 +++----
.../Modules/{FindUUID.cmake => Findlibuuid.cmake} | 18 ++++-----
.../Modules/{FindLIBZIP.cmake => Findlibzip.cmake} | 8 ++--
libs/dfi/CMakeLists.txt | 4 +-
libs/dfi/gtest/CMakeLists.txt | 2 +-
libs/etcdlib/cmake/Findjansson.cmake | 16 ++++----
libs/framework/CMakeLists.txt | 4 +-
libs/utils/CMakeLists.txt | 2 +-
24 files changed, 98 insertions(+), 136 deletions(-)
delete mode 100644 cmake/Modules/FindSyslog.cmake
rename cmake/Modules/{FindFFI.cmake => Findlibffi.cmake} (83%)
rename cmake/Modules/{FindUUID.cmake => Findlibuuid.cmake} (78%)
rename cmake/Modules/{FindLIBZIP.cmake => Findlibzip.cmake} (87%)
