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 c09b8e68f10b98e3709e70bb9cc55d7ec727ce21 Author: PengZheng <[email protected]> AuthorDate: Fri Jul 14 11:42:39 2023 +0800 Add automatic dependency deduction to examples, and remove DEPS from celix_subproject. --- bundles/cxx_remote_services/integration/CMakeLists.txt | 2 +- bundles/pubsub/CMakeLists.txt | 2 +- bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt | 2 +- bundles/pubsub/pubsub_discovery/CMakeLists.txt | 2 +- bundles/remote_services/discovery_etcd/CMakeLists.txt | 2 +- bundles/shell/remote_shell/CMakeLists.txt | 2 +- bundles/shell/shell_bonjour/CMakeLists.txt | 2 +- conanfile.py | 8 +++++++- examples/celix-examples/CMakeLists.txt | 2 +- libs/pushstreams/CMakeLists.txt | 2 +- misc/experimental/bundles/event_admin/CMakeLists.txt | 2 +- 11 files changed, 17 insertions(+), 11 deletions(-) diff --git a/bundles/cxx_remote_services/integration/CMakeLists.txt b/bundles/cxx_remote_services/integration/CMakeLists.txt index c7b4a73d..63df4e1e 100644 --- a/bundles/cxx_remote_services/integration/CMakeLists.txt +++ b/bundles/cxx_remote_services/integration/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -celix_subproject(CXX_RSA_INTEGRATION "Option to build the C++17 Remote Service Admin Service integration" ON DEPS SHELL SHELL_TUI PUBSUB PROMISES PUSHSTREAMS PUBSUB_PSA_ZMQ PUBSUB_DISCOVERY_ETCD) +celix_subproject(CXX_RSA_INTEGRATION "Option to build the C++17 Remote Service Admin Service integration" ON) if (CXX_RSA_INTEGRATION) add_celix_bundle(TestExportImportRemoteServiceFactory SOURCES src/TestExportImportRemoteServiceFactory.cc diff --git a/bundles/pubsub/CMakeLists.txt b/bundles/pubsub/CMakeLists.txt index b4985be6..bf8fe5f6 100644 --- a/bundles/pubsub/CMakeLists.txt +++ b/bundles/pubsub/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -celix_subproject(PUBSUB "Option to build the pubsub bundles" ON DEPS CELIX_DFI) +celix_subproject(PUBSUB "Option to build the pubsub bundles" ON) if (PUBSUB) add_subdirectory(pubsub_api) add_subdirectory(pubsub_utils) diff --git a/bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt b/bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt index 7e32182f..752004ca 100644 --- a/bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_websocket/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -celix_subproject(PUBSUB_PSA_WS "Build WebSocket PubSub Admin" ON DEPS HTTP_ADMIN) +celix_subproject(PUBSUB_PSA_WS "Build WebSocket PubSub Admin" ON) if (PUBSUB_PSA_WS) find_package(jansson REQUIRED) find_package(libuuid REQUIRED) diff --git a/bundles/pubsub/pubsub_discovery/CMakeLists.txt b/bundles/pubsub/pubsub_discovery/CMakeLists.txt index bf752b08..ca73cae8 100644 --- a/bundles/pubsub/pubsub_discovery/CMakeLists.txt +++ b/bundles/pubsub/pubsub_discovery/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -celix_subproject(PUBSUB_DISCOVERY_ETCD "Option to enable building the PubSub Discovery (ETCD) bundle" ON DEPS CELIX_ETCDLIB) +celix_subproject(PUBSUB_DISCOVERY_ETCD "Option to enable building the PubSub Discovery (ETCD) bundle" ON) if (PUBSUB_DISCOVERY_ETCD) find_package(jansson REQUIRED) diff --git a/bundles/remote_services/discovery_etcd/CMakeLists.txt b/bundles/remote_services/discovery_etcd/CMakeLists.txt index 532af9e5..67de7513 100644 --- a/bundles/remote_services/discovery_etcd/CMakeLists.txt +++ b/bundles/remote_services/discovery_etcd/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -celix_subproject(RSA_DISCOVERY_ETCD "Option to enable building the Discovery (ETCD) bundle" ON DEPS CELIX_ETCDLIB) +celix_subproject(RSA_DISCOVERY_ETCD "Option to enable building the Discovery (ETCD) bundle" ON) if (RSA_DISCOVERY_ETCD) add_celix_bundle(rsa_discovery_etcd VERSION 0.9.0 diff --git a/bundles/shell/remote_shell/CMakeLists.txt b/bundles/shell/remote_shell/CMakeLists.txt index 99627c97..51bc5e9e 100644 --- a/bundles/shell/remote_shell/CMakeLists.txt +++ b/bundles/shell/remote_shell/CMakeLists.txt @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -celix_subproject(REMOTE_SHELL "Option to enable building the Remote Shell bundles" ON DEPS SHELL) +celix_subproject(REMOTE_SHELL "Option to enable building the Remote Shell bundles" ON) if (REMOTE_SHELL) add_celix_bundle(remote_shell diff --git a/bundles/shell/shell_bonjour/CMakeLists.txt b/bundles/shell/shell_bonjour/CMakeLists.txt index 5a1cb556..929c1b7f 100644 --- a/bundles/shell/shell_bonjour/CMakeLists.txt +++ b/bundles/shell/shell_bonjour/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -celix_subproject(SHELL_BONJOUR "Option to enable building the Bonjour Shell (shell access by chat clients)" OFF DEPS SHELL) +celix_subproject(SHELL_BONJOUR "Option to enable building the Bonjour Shell (shell access by chat clients)" OFF) if (SHELL_BONJOUR) message(WARNING "Celix::bonjour_shell is considered unstable, because develop of this bundle has been dormant for a while") find_package(LibXml2 REQUIRED) diff --git a/conanfile.py b/conanfile.py index 8f869b22..6411fb41 100644 --- a/conanfile.py +++ b/conanfile.py @@ -211,9 +211,14 @@ class CelixConan(ConanFile): self.options.build_pubsub_integration = False self.options.enable_code_coverage = False + if self.options.build_examples: + self.options.build_shell_tui = True + self.options.build_shell_wui = True + self.options.build_log_service = True + self.options.build_syslog_writer = True + if self.options.build_shell_bonjour: self.options.build_shell = True - self.options.celix_install_deprecated_api = True if self.options.build_cxx_rsa_integration: self.options.build_cxx_remote_service_admin = True @@ -293,6 +298,7 @@ class CelixConan(ConanFile): self.options.build_framework = True self.options.build_log_helper = True self.options.build_celix_dfi = True + self.options.celix_install_deprecated_api = True if self.options.build_remote_shell: self.options.build_shell = True diff --git a/examples/celix-examples/CMakeLists.txt b/examples/celix-examples/CMakeLists.txt index c05966ec..c4a6d983 100644 --- a/examples/celix-examples/CMakeLists.txt +++ b/examples/celix-examples/CMakeLists.txt @@ -16,7 +16,7 @@ # under the License. if (COMMAND celix_subproject) - celix_subproject(EXAMPLES "Option to enable building the Examples" ON DEPS SHELL SHELL_TUI LOG_SERVICE) + celix_subproject(EXAMPLES "Option to enable building the Examples" ON) else () set(EXAMPLES true) #celix_subproject is only available in the celix project -> using examples dir in other project is also supported option(CELIX_CXX14 "Build C++14 libraries and bundles." ON) diff --git a/libs/pushstreams/CMakeLists.txt b/libs/pushstreams/CMakeLists.txt index d63e11b1..76a9ac74 100644 --- a/libs/pushstreams/CMakeLists.txt +++ b/libs/pushstreams/CMakeLists.txt @@ -16,7 +16,7 @@ # under the License. set(PUSHSTREAMS_DEFAULT_ON ${CELIX_CXX17}) -celix_subproject(PUSHSTREAMS "Option to build the PushStreams library" ${PUSHSTREAMS_DEFAULT_ON} DEPS PROMISES) +celix_subproject(PUSHSTREAMS "Option to build the PushStreams library" ${PUSHSTREAMS_DEFAULT_ON}) if (PUSHSTREAMS) set(CMAKE_CXX_STANDARD 17) diff --git a/misc/experimental/bundles/event_admin/CMakeLists.txt b/misc/experimental/bundles/event_admin/CMakeLists.txt index 28820699..89df1ed4 100644 --- a/misc/experimental/bundles/event_admin/CMakeLists.txt +++ b/misc/experimental/bundles/event_admin/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -celix_subproject(EVENT_ADMIN "Option to enable building the Event Admin Service bundles" OFF DEPS LAUNCHER LOG_SERVICE SHELL shell_tui) +celix_subproject(EVENT_ADMIN "Option to enable building the Event Admin Service bundles" OFF) if(EVENT_ADMIN) #add_subdirectory(utils)
