You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pe...@apache.org on 2023/02/22 11:20:09 UTC
[celix] 01/01: Merge branch 'master' into hotfix/conan_build
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/conan_build
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 6f6681b4a8bf8f0a2b530a72b0d78efbfb170728
Merge: e5ec4ab7 5d9beec9
Author: PengZheng <ho...@gmail.com>
AuthorDate: Wed Feb 22 19:19:42 2023 +0800
Merge branch 'master' into hotfix/conan_build
CMakeLists.txt | 11 ----
.../integration/gtest/CMakeLists.txt | 2 +-
bundles/http_admin/gtest/CMakeLists.txt | 1 -
bundles/pubsub/CMakeLists.txt | 2 +-
bundles/pubsub/integration/CMakeLists.txt | 2 +-
bundles/pubsub/pubsub_utils/CMakeLists.txt | 2 +-
bundles/remote_services/CMakeLists.txt | 2 +-
.../rsa_shm/gtest/CMakeLists.txt | 1 +
.../rsa_rpc_json/gtest/CMakeLists.txt | 1 +
cmake/CelixConfig.cmake | 11 +++-
conanfile.py | 12 ++--
libs/dfi/CMakeLists.txt | 71 +++++++++++-----------
libs/dfi/gtest/CMakeLists.txt | 1 +
libs/dfi/src/dyn_function.c | 2 +-
libs/dfi/{include => src}/dyn_function_common.h | 0
libs/dfi/{include => src}/dyn_interface_common.h | 0
libs/dfi/src/dyn_type.c | 2 +-
libs/dfi/{include => src}/dyn_type_common.h | 0
libs/dfi/src/json_rpc.c | 2 +-
libs/etcdlib/CMakeLists.txt | 5 +-
libs/framework/CMakeLists.txt | 2 +-
21 files changed, 67 insertions(+), 65 deletions(-)