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 9763b611460d7fcbba976f9d9e18429b8a56920e
Merge: 9647e660 4e7c7a48
Author: PengZheng <howto...@gmail.com>
AuthorDate: Thu Aug 24 19:48:29 2023 +0800
Merge pull request #620 from apache/feature/483-conan-2-support
Feature/483 Conan 2 Support
.github/workflows/conan_create.yml | 24 +-
.github/workflows/coverage.yml | 7 +-
.github/workflows/macos.yml | 11 +-
.github/workflows/ubuntu.yml | 9 +-
.../discovery_configured/CMakeLists.txt | 2 +-
bundles/pubsub/integration/CMakeLists.txt | 2 +
.../src/pubsub_udpmc_topic_receiver.c | 2 +-
bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt | 2 +-
.../discovery_zeroconf/gtest/CMakeLists.txt | 2 +-
.../rsa_common/gtest/CMakeLists.txt | 1 -
cmake/Modules/FindCppUTest.cmake | 18 +-
cmake/Modules/FindRapidJSON.cmake | 9 +-
cmake/Modules/FindZeroMQ.cmake | 9 +-
cmake/Modules/Findczmq.cmake | 11 +-
cmake/Modules/Findlibzip.cmake | 9 +-
conanfile.py | 504 ++++++++++-----------
documents/building/dev_celix_with_clion.md | 19 +-
examples/conan_test_package_v2/CMakeLists.txt | 19 +
examples/conan_test_package_v2/conanfile.py | 185 ++++++++
libs/dfi/src/json_serializer.c | 2 +-
libs/utils/CMakeLists.txt | 16 +-
libs/utils/error_injector/zip/CMakeLists.txt | 2 +-
libs/utils/gtest/CMakeLists.txt | 2 +-
23 files changed, 530 insertions(+), 337 deletions(-)
