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 4e70917e7d8c35f9970e14401d7736d242152d7a Merge: 9cf8bc39 7c68393a Author: PengZheng <[email protected]> AuthorDate: Mon Apr 4 16:05:41 2022 +0800 Merge pull request #401 from apache/feature/conan_support Add basic Conan support CMakeLists.txt | 55 +- bundles/cxx_remote_services/CMakeLists.txt | 13 +- .../cxx_remote_services/admin/gtest/CMakeLists.txt | 2 +- .../discovery_configured/gtest/CMakeLists.txt | 2 +- .../cxx_remote_services/integration/CMakeLists.txt | 81 +- bundles/cxx_remote_services/rsa_spi/CMakeLists.txt | 6 +- bundles/deployment_admin/CMakeLists.txt | 25 +- bundles/device_access/CMakeLists.txt | 4 +- bundles/device_access/device_access/CMakeLists.txt | 8 +- bundles/device_access/example/CMakeLists.txt | 2 +- bundles/http_admin/CMakeLists.txt | 2 +- bundles/http_admin/civetweb/CMakeLists.txt | 9 +- bundles/http_admin/http_admin_api/CMakeLists.txt | 6 +- bundles/logging/CMakeLists.txt | 19 +- bundles/logging/log_admin/gtest/CMakeLists.txt | 2 +- bundles/logging/log_helper/CMakeLists.txt | 12 +- bundles/logging/log_service_api/CMakeLists.txt | 10 +- bundles/logging/log_writers/CMakeLists.txt | 2 +- .../log_writers/syslog_writer/CMakeLists.txt | 2 +- .../log_writers/syslog_writer/gtest/CMakeLists.txt | 3 +- bundles/pubsub/CMakeLists.txt | 31 +- bundles/pubsub/examples/CMakeLists.txt | 663 +++++++------- bundles/pubsub/integration/CMakeLists.txt | 984 +++++++++++---------- bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt | 49 +- bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt | 45 +- .../pubsub/pubsub_admin_websocket/CMakeLists.txt | 47 +- bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt | 65 +- bundles/pubsub/pubsub_api/CMakeLists.txt | 7 +- bundles/pubsub/pubsub_discovery/CMakeLists.txt | 41 +- .../pubsub_serializer_avrobin/gtest/CMakeLists.txt | 2 +- .../pubsub/pubsub_serializer_json/CMakeLists.txt | 6 +- .../pubsub_serializer_json/gtest/CMakeLists.txt | 2 +- bundles/pubsub/pubsub_spi/CMakeLists.txt | 8 +- bundles/pubsub/pubsub_utils/CMakeLists.txt | 6 +- bundles/pubsub/pubsub_utils/gtest/CMakeLists.txt | 3 +- bundles/remote_services/CMakeLists.txt | 17 +- .../deprecated_rsa_spi/CMakeLists.txt | 6 +- .../discovery_configured/CMakeLists.txt | 43 +- .../remote_services/discovery_etcd/CMakeLists.txt | 57 +- .../examples/interceptors/CMakeLists.txt | 2 +- .../remote_service_admin_dfi/CMakeLists.txt | 66 +- .../remote_service_admin_dfi/gtest/CMakeLists.txt | 10 +- .../private/test/CMakeLists.txt | 2 +- .../remote_services_api/CMakeLists.txt | 6 +- bundles/remote_services/rsa_common/CMakeLists.txt | 2 +- .../topology_manager/CMakeLists.txt | 11 +- .../topology_manager/tms_tst/CMakeLists.txt | 6 +- .../topology_manager/tms_tst/bundle/CMakeLists.txt | 3 +- .../tms_tst/disc_mock/CMakeLists.txt | 3 +- bundles/shell/remote_shell/CMakeLists.txt | 32 +- bundles/shell/shell/CMakeLists.txt | 36 +- bundles/shell/shell/gtest/CMakeLists.txt | 22 +- bundles/shell/shell_bonjour/CMakeLists.txt | 6 +- .../shell_bonjour/private/src/bonjour_shell.c | 2 +- bundles/shell/shell_tui/CMakeLists.txt | 4 +- bundles/shell/shell_wui/CMakeLists.txt | 2 - cmake/CelixConfig.cmake | 54 +- cmake/Modules/FindCppUTest.cmake | 14 + cmake/Modules/FindJansson.cmake | 6 +- cmake/Modules/FindLIBZIP.cmake | 2 +- cmake/celix_project/CelixProject.cmake | 34 +- cmake/celix_project/CodeCoverage.cmake | 2 +- cmake/cmake_celix/BundlePackaging.cmake | 5 +- cmake/cmake_celix/ContainerPackaging.cmake | 3 +- cmake/cmake_celix/UseCelix.cmake | 37 - conanfile.py | 255 ++++++ examples/CMakeLists.txt | 1 - examples/celix-examples/CMakeLists.txt | 2 +- examples/conan_test_package/CMakeLists.txt | 269 ++++++ examples/conan_test_package/README.md | 52 ++ examples/conan_test_package/conanfile.py | 106 +++ examples/conan_test_package/hello_bundle.c | 48 + .../conan_test_package/my_log_writer_activator.c | 71 ++ examples/conan_test_package/my_psa_activator.c | 184 ++++ examples/conan_test_package/my_rsa_activator.c | 115 +++ examples/conan_test_package/test_cxx_shell.cpp | 84 ++ examples/conan_test_package/test_etcd_lib.c | 31 + examples/conan_test_package/test_framework.c | 39 + .../conan_test_package/test_http_admin_activator.c | 95 ++ examples/conan_test_package/test_promises.cpp | 32 + examples/conan_test_package/test_pushstreams.cpp | 49 + examples/conan_test_package/test_shell.c | 72 ++ libs/CMakeLists.txt | 4 +- libs/dependency_manager/CMakeLists.txt | 5 +- libs/dfi/CMakeLists.txt | 7 +- libs/dfi/gtest/CMakeLists.txt | 2 +- libs/etcdlib/CMakeLists.txt | 103 +-- libs/etcdlib/cmake/FindJansson.cmake | 19 +- libs/framework/CMakeLists.txt | 9 +- libs/launcher/CMakeLists.txt | 11 +- libs/promises/CMakeLists.txt | 7 +- libs/pushstreams/CMakeLists.txt | 8 +- .../pushstreams/api/celix/impl/PushEventConsumer.h | 1 + libs/utils/CMakeLists.txt | 26 +- misc/experimental/CMakeLists.txt | 2 +- .../config_admin/config_admin_tst/CMakeLists.txt | 2 +- .../bundles/pubsub_admin_nanomsg/CMakeLists.txt | 1 - 97 files changed, 2987 insertions(+), 1444 deletions(-)
