This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch feature/579-automatic-dependency-deduction in repository https://gitbox.apache.org/repos/asf/celix.git
commit dbebb570a9a2d0a1b1e031a599f3667dbe857c4f Author: PengZheng <[email protected]> AuthorDate: Fri Jul 14 14:21:54 2023 +0800 Add missing dependency specifications. --- bundles/logging/log_writers/syslog_writer/CMakeLists.txt | 2 +- bundles/shell/shell/CMakeLists.txt | 2 +- conanfile.py | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bundles/logging/log_writers/syslog_writer/CMakeLists.txt b/bundles/logging/log_writers/syslog_writer/CMakeLists.txt index 63e11749..dd6934f7 100644 --- a/bundles/logging/log_writers/syslog_writer/CMakeLists.txt +++ b/bundles/logging/log_writers/syslog_writer/CMakeLists.txt @@ -24,7 +24,7 @@ add_celix_bundle(syslog_writer SOURCES src/celix_syslog_writer_activator.c ) -target_link_libraries(syslog_writer PRIVATE Celix::log_helper Celix::log_service_api) +target_link_libraries(syslog_writer PRIVATE Celix::log_service_api) install_celix_bundle(syslog_writer EXPORT celix COMPONENT logging) #Setup target aliases to match external usage diff --git a/bundles/shell/shell/CMakeLists.txt b/bundles/shell/shell/CMakeLists.txt index a48acf18..140f4ea4 100644 --- a/bundles/shell/shell/CMakeLists.txt +++ b/bundles/shell/shell/CMakeLists.txt @@ -23,8 +23,8 @@ if (SHELL_API) ) target_link_libraries(shell_api INTERFACE Celix::utils) - if (CELIX_INSTALL_DEPRECATED_API) target_include_directories(shell_api INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/deprecated_api>) + if (CELIX_INSTALL_DEPRECATED_API) install(DIRECTORY deprecated_api/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/shell COMPONENT shell) endif () diff --git a/conanfile.py b/conanfile.py index 6411fb41..d96eabbe 100644 --- a/conanfile.py +++ b/conanfile.py @@ -220,6 +220,9 @@ class CelixConan(ConanFile): if self.options.build_shell_bonjour: self.options.build_shell = True + if self.options.build_deployment_admin: + self.options.build_framework = True + if self.options.build_cxx_rsa_integration: self.options.build_cxx_remote_service_admin = True self.options.build_pushstreams = True @@ -315,6 +318,9 @@ class CelixConan(ConanFile): self.options.build_log_helper = True self.options.build_framework = True + if self.options.build_http_admin: + self.options.build_framework = True + if self.options.build_syslog_writer: self.options.build_log_service = True @@ -345,6 +351,9 @@ class CelixConan(ConanFile): self.options.build_framework = True self.options.celix_cxx14 = True + if self.options.build_celix_dfi: + self.options.build_utils = True + if self.options.build_framework: self.options.build_utils = True
