[celix] branch feature/remove_dfi_dep updated: Add missing `find_package` and fix incorrect conan option.

[pengzheng]

This is an automated email from the ASF dual-hosted git repository.

pengzheng pushed a commit to branch feature/remove_dfi_dep
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/feature/remove_dfi_dep by this 
push:
     new fcb6ef9c Add missing `find_package` and fix incorrect conan option.
fcb6ef9c is described below

commit fcb6ef9cd0d9370a78da46c8b7084c12af5bc4be
Author: PengZheng <howto...@gmail.com>
AuthorDate: Thu Feb 9 19:47:07 2023 +0800

    Add missing `find_package` and fix incorrect conan option.
---
 conanfile.py                | 6 +++---
 libs/etcdlib/CMakeLists.txt | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/conanfile.py b/conanfile.py
index 8cced60a..5e959cad 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -77,7 +77,7 @@ class CelixConan(ConanFile):
         "build_promises": [True, False],
         "build_pushstreams": [True, False],
         "build_experimental": [True, False],
-        "build_dfi": [True, False],
+        "build_celix_dfi": [True, False],
         "celix_cxx14": [True, False],
         "celix_cxx17": [True, False],
         "celix_install_deprecated_api": [True, False],
@@ -123,7 +123,7 @@ class CelixConan(ConanFile):
         "build_promises": False,
         "build_pushstreams": False,
         "build_experimental": False,
-        "build_dfi": True,
+        "build_celix_dfi": True,
         "celix_cxx14": True,
         "celix_cxx17": True,
         "celix_install_deprecated_api": False,
@@ -226,7 +226,7 @@ class CelixConan(ConanFile):
         if self.options.build_http_admin or 
self.options.build_remote_service_admin:
             self.requires("civetweb/1.15")
             self.options['civetweb'].shared = True
-        if self.options.build_dfi:
+        if self.options.build_celix_dfi:
             self.requires("libffi/[>=3.2.1 <4.0.0]")
             self.options['libffi'].shared = True
 
diff --git a/libs/etcdlib/CMakeLists.txt b/libs/etcdlib/CMakeLists.txt
index 2103a5f4..ccde2060 100644
--- a/libs/etcdlib/CMakeLists.txt
+++ b/libs/etcdlib/CMakeLists.txt
@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+find_package(CURL REQUIRED)
+find_package(jansson REQUIRED)
 
 if (NOT COMMAND celix_subproject) 
     #If COMMAND celix_subproject is not defined, this CMakeLists will
@@ -36,9 +38,6 @@ if (NOT COMMAND celix_subproject)
 
     set(ETCDLIB_CMP ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
 
-    find_package(CURL REQUIRED)
-    find_package(jansson REQUIRED)
-
     if (NOT TARGET CURL::libcurl)
         #Note more recent curl will create CURL::libcurl target
         message("Note CURL::libcurl target not created by find_package(CURL). 
Creating CURL::libcurl Target.")