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 9647e660 Merge pull request #616 from
apache/feature/527-manifest-improvement
add 60b59416 Drop generators unsupported by Conan 2.0
add 681c6ef7 Merge branch 'master' into feature/483-conan-2-support
add 2e42f25a Use conan2's conanrun.sh
add 93d93ec2 Stop gap for #618
add 949ec5dc Specify dependency options in a way compatible with both
Conan1 and Conan2.
add 6d25aa62 Implement dynamic defaults.
add c181c050 Simplify options settings.
add 73f44eaf Fix version conflict of openssl caused by civetweb.
add 00336571 Add test_package for Conan2.
add ff7ad59d Fix linking error caused by private linking of transitive
dependencies and wrong cwd.
add af027163 Use Conan2 for conan_create/ubuntu-build
add f292a838 Fix profile setup for conan_create/ubuntu-build
add dfae92ea Fix option setting error for conan_create/ubuntu-build
add e7d277ad Remove irrelevant dependency of unit_test_rsa_common.
add 1c5605af Fix missing `deps_cpp_info` for Conan 2
add a2d547a1 Update documentation to reflect the new conan based workflow.
add 2e48484e Remove unsupported `conan build --configure`.
add ff265039 Enable ninja for all conan build.
add ad184301 Run gcov by ninja.
add 697e7ede Run gcov by GNU make.
add a76ad793 Fix asan error and re-enable pubsub_udpmc_tests.
add 9ea3246c Still recommend using `conan build` in our Conan-based CLion
workflow but mention a quicker way to skip full building.
add 4e7c7a48 Avoid breaking downstream user who link to these targets.
new 9763b611 Merge pull request #620 from
apache/feature/483-conan-2-support
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:
.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(-)
create mode 100644 examples/conan_test_package_v2/CMakeLists.txt
create mode 100644 examples/conan_test_package_v2/conanfile.py
