[celix] branch feature/483-conan-2-support updated: Fix option setting error for conan_create/ubuntu-build

[pengzheng]

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 dfae92ea Fix option setting error for conan_create/ubuntu-build
dfae92ea is described below

commit dfae92ea37b8524a1fdb4cb10b7a53d6e849dcf6
Author: PengZheng <howto...@gmail.com>
AuthorDate: Wed Aug 23 16:00:37 2023 +0800

    Fix option setting error for conan_create/ubuntu-build
---
 .github/workflows/conan_create.yml | 1 -
 conanfile.py                       | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/conan_create.yml 
b/.github/workflows/conan_create.yml
index 5f29d981..3b791fc7 100644
--- a/.github/workflows/conan_create.yml
+++ b/.github/workflows/conan_create.yml
@@ -30,7 +30,6 @@ jobs:
         run: |
           # build profile
           conan profile detect -f
-          echo tools.cmake.cmaketoolchain:generator=Ninja >> 
~\.conan2\global.conf
       - name: Create Celix
         env:
           CC: ${{ matrix.compiler[0] }}
diff --git a/conanfile.py b/conanfile.py
index 9c1e2c60..dd29d583 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -173,9 +173,8 @@ class CelixConan(ConanFile):
             options["build_rsa_discovery_zeroconf"] = False
             options["build_shell_bonjour"] = False
 
-        if not options["enable_testing"]:
-            options["build_pubsub_integration"] = False
-            options["enable_code_coverage"] = False
+        if options["enable_code_coverage"]:
+            options["enable_testing"] = True
 
         if options["build_examples"]:
             options["build_shell_tui"] = True
@@ -209,6 +208,7 @@ class CelixConan(ConanFile):
             options["build_pubsub_json_serializer"] = True
             options["build_pubsub_wire_protocol_v2"] = True
             options["build_pubsub_wire_protocol_v1"] = True
+            options["enable_testing"] = True
 
         if options["build_pubsub_examples"]:
             options["build_log_service"] = True