This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a change to branch hotfix/conan_build
in repository https://gitbox.apache.org/repos/asf/celix.git
from e5ec4ab7 Stick to Conan 1.59.0.
add 82c17645 Remove the framework's dependence on dfi.
add 6ca9eaf4 Merge branch 'master' into feature/remove_dfi_dep
add ff553fc3 Make ffi a private dependency of dfi.
add 4ae64356 Merge branch 'master' into feature/remove_dfi_dep
add 05559468 Make libffi and jansson optional dependencies.
add fcb6ef9c Add missing `find_package` and fix incorrect conan option.
add 07685f7c Fix standalone etcdlib build error.
add 65bc7c0f Jansson is no longer a mandatory requirement.
add 5d9beec9 Merge pull request #478 from apache/feature/remove_dfi_dep
new 6f6681b4 Merge branch 'master' into hotfix/conan_build
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:
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(-)
rename libs/dfi/{include => src}/dyn_function_common.h (100%)
rename libs/dfi/{include => src}/dyn_interface_common.h (100%)
rename libs/dfi/{include => src}/dyn_type_common.h (100%)
