This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch feature/483-conan-2-support
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/483-conan-2-support by
this push:
new a2d547a1 Update documentation to reflect the new conan based workflow.
a2d547a1 is described below
commit a2d547a14284c91fde1e18ba2bf3752c306d8256
Author: PengZheng <howto...@gmail.com>
AuthorDate: Wed Aug 23 20:00:32 2023 +0800
Update documentation to reflect the new conan based workflow.
---
documents/building/dev_celix_with_clion.md | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/documents/building/dev_celix_with_clion.md
b/documents/building/dev_celix_with_clion.md
index 8de4c6d3..6f0c6f10 100644
--- a/documents/building/dev_celix_with_clion.md
+++ b/documents/building/dev_celix_with_clion.md
@@ -47,12 +47,19 @@ conan profile update settings.build_type=Debug debug
#generate and configure cmake-build-debug directory
conan install . celix/2.3.0 -pr:b default -pr:h debug -if cmake-build-debug/
-o celix:enable_testing=True -o celix:enable_address_sanitizer=True -o
celix:build_all=True -b missing
-conan build . -bf cmake-build-debug/ --configure
-#optional build
+#invoke the exact cmake command `conan install` shows to configure the build
directory
cd cmake-build-debug
+cmake .. -G "Unix Makefiles"
-DCMAKE_TOOLCHAIN_FILE=/home/peng/Downloads/git/mycelix/cmake-build-debug/conan_toolchain.cmake
-DENABLE_TESTING=ON -DENABLE_CODE_COVERAGE=OFF -DENABLE_ADDRESS_SANITIZER=ON
-DENABLE_UNDEFINED_SANITIZER=OFF -DENABLE_THREAD_SANITIZER=OFF
-DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=OFF
-DENABLE_TESTING_FOR_CXX14=OFF -DBUILD_ALL=ON -DBUILD_DEPLOYMENT_ADMIN=ON
-DBUILD_HTTP_ADMIN=ON -DBUILD_LOG_SERVICE=ON -DBUILD_LOG_HELPER=ON
-DBUILD_LOG_SERVICE_API=ON -DBUILD_S [...]
+
+#optional build, you may want to skip it and use CLion to build
make -j
+# if you don't like the above very long cmake command, you may use the
following command instead
+# Note that it does a full building, which may take a long time
+# conan build . -bf cmake-build-debug/
+
+
#optional setup run env and run tests
source conanrun.sh
ctest --verbose
@@ -63,10 +70,10 @@ source deactivate_conanrun.sh
To ensure that all Conan build dependencies can be found the Run/Debug
configurations of CLion needs te be updated.
This can be done under the menu "Run->Edit Configurations...", then select
"Edit configuration templates..." and
-then update the "Google Test" template so that the `active_run.sh` Conan
generated script is sourced in the
+then update the "Google Test" template so that the `conanrun.sh` Conan
generated script is sourced in the
"Environment variables" entry.
If the Apache Celix CMake build directory is
`home/joe/workspace/celix/cmake-build-debug` then the value for
-"Environment variables" should be: `source
/home/joe/workspace/celix/cmake-build-debug/environment_run.sh.env`
+"Environment variables" should be: `source
/home/joe/workspace/celix/cmake-build-debug/conanrun.sh`
