This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch feature/civetweb_integration
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/civetweb_integration
by this push:
new d469ba6d Re-enable `conan create` for masOS.
d469ba6d is described below
commit d469ba6db137894c3123f7623b89896e8e4b79e5
Author: PengZheng <[email protected]>
AuthorDate: Sun Feb 5 12:12:25 2023 +0800
Re-enable `conan create` for masOS.
---
.github/workflows/macos.yml | 7 +++----
conanfile.py | 1 +
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a8a3e7d4..792bfa1b 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -48,10 +48,9 @@ jobs:
source activate_run.sh
ctest --verbose
source deactivate_run.sh
-# test_package failed to find CelixConfig.cmake
-# - name: Test Installed Celix
-# run: |
-# conan create -pr:b default -pr:h default -tf
examples/conan_test_package -tbf test-build -o celix:celix_cxx17=True -o
celix:celix_install_deprecated_api=True --require-override=libcurl/7.64.1
--require-override=openssl/1.1.1s .
+ - name: Test Installed Celix
+ run: |
+ conan create -pr:b default -pr:h default -tf
examples/conan_test_package -tbf test-build -o celix:build_all=True -o
celix:celix_cxx17=True -o celix:celix_install_deprecated_api=True
--require-override=libcurl/7.64.1 --require-override=openssl/1.1.1s .
build-brew:
runs-on: macOS-latest
diff --git a/conanfile.py b/conanfile.py
index e4f92862..7a440538 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -259,3 +259,4 @@ class CelixConan(ConanFile):
# check
https://docs.conan.io/en/latest/reference/conanfile/methods.html#imports
self.cpp_info.bindirs = ["bin", os.path.join("share", self.name,
"bundles")]
self.cpp_info.build_modules["cmake"].append(os.path.join("lib",
"cmake", "Celix", "CelixConfig.cmake"))
+
self.cpp_info.build_modules["cmake_find_package"].append(os.path.join("lib",
"cmake", "Celix", "CelixConfig.cmake"))