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 36ce8b1dc Merge pull request #837 from
apache/feature/816-drop-conan-1.x
add b30e173db Implement dependencies option conflict detection.
add 5d558ed2a disable CMakeDeps For installed CMake config files.
add 578a6d50f Update build instructions.
new b1bb0d61d Merge pull request #838 from
apache/feature/option-conflict-detection
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:
.devcontainer/devcontainer.json | 2 +-
.github/workflows/conan_create.yml | 8 +--
.github/workflows/containers.yml | 1 +
.github/workflows/coverage.yml | 2 +
.github/workflows/fuzzing.yml | 1 +
.github/workflows/macos.yml | 2 +
.github/workflows/ubuntu.yml | 2 +
conanfile.py | 102 ++++++++++++++++++-----------
documents/building/README.md | 6 +-
documents/building/dev_celix_with_clion.md | 34 +++-------
10 files changed, 92 insertions(+), 68 deletions(-)
