Add option to control whether to install Find modules defined by Celi…

…x, and skip it in conan build.
apache · Jan 17, 2024 · 3f039d3 · 3f039d3
1 parent 58589ad
commit 3f039d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -221,7 +221,10 @@ install(EXPORT celix NAMESPACE Celix:: DESTINATION share/celix/cmake FILE Target
 install_celix_targets(celix NAMESPACE Celix:: DESTINATION share/celix/cmake FILE CelixTargets COMPONENT cmake)
 
 #install celix cmake modules
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/ DESTINATION share/celix/cmake/Modules)
+option(INSTALL_FIND_MODULES "Whether to install Find modules defined by Celix" ON)
+if (INSTALL_FIND_MODULES)
+    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/ DESTINATION share/celix/cmake/Modules)
+endif ()
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_celix/ DESTINATION share/celix/cmake/cmake_celix)
 
 file(GENERATE

diff --git a/conanfile.py b/conanfile.py
@@ -47,6 +47,7 @@ class CelixConan(ConanFile):
         "enable_address_sanitizer": False,
         "enable_undefined_sanitizer": False,
         "enable_thread_sanitizer": False,
+        "install_find_modules": False,
         "build_all": False,
         "build_http_admin": False,
         "build_log_service": False,