This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git
commit 878791aff932b6b0ec55f3b8dbd691664bffa458 Merge: 91fff325 a7412f95 Author: PengZheng <[email protected]> AuthorDate: Sat Apr 9 10:58:03 2022 +0800 Merge pull request #411 from apache/feature/conan_find_module_unification Unify conan autogenerated find modules with Celix's own find modules. 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(-)
