This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/master by this push:
new 9e2f814 Fix RSA CMake error.
new dacbc04 Merge pull request #384 from PengZheng/rsa_cmake_fix
9e2f814 is described below
commit 9e2f81499008e211d9372708a965d6bc1cf1c768
Author: PengZheng <[email protected]>
AuthorDate: Tue Dec 14 15:30:12 2021 +0800
Fix RSA CMake error.
Break cyclic dependency between examples and other RSA tests.
---
bundles/remote_services/CMakeLists.txt | 33 +++++++++++++++++++++++
bundles/remote_services/examples/CMakeLists.txt | 35 -------------------------
2 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/bundles/remote_services/CMakeLists.txt
b/bundles/remote_services/CMakeLists.txt
index 9955c2c..94fee52 100644
--- a/bundles/remote_services/CMakeLists.txt
+++ b/bundles/remote_services/CMakeLists.txt
@@ -42,6 +42,39 @@ if (REMOTE_SERVICE_ADMIN)
#add_subdirectory(remote_service_admin_shm)
endif ()
+ if (BUILD_RSA_DISCOVERY_ETCD AND BUILD_RSA_REMOTE_SERVICE_ADMIN_DFI)
+ add_celix_container(remote-services-dfi
+ NAME "server"
+ GROUP "remote-services/remote-services-dfi"
+ BUNDLES
+ Celix::rsa_discovery_etcd
+ Celix::rsa_topology_manager
+ Celix::rsa_dfi
+ Celix::shell
+ Celix::shell_tui
+ Celix::log_admin
+
+ celix_remote_interceptors_example
+ calculator
+ PROPERTIES
+ RSA_PORT=18888
+ )
+
+ add_celix_container(remote-services-dfi-client
+ NAME "client"
+ GROUP "remote-services/remote-services-dfi"
+ BUNDLES
+ Celix::rsa_topology_manager
+ Celix::rsa_dfi Celix::shell
+ Celix::shell_tui
+ Celix::log_admin
+ Celix::rsa_discovery_etcd
+ celix_remote_interceptors_example
+ calculator_shell
+ PROPERTIES
+ RSA_PORT=28888
+ )
+ endif()
endif (REMOTE_SERVICE_ADMIN)
diff --git a/bundles/remote_services/examples/CMakeLists.txt
b/bundles/remote_services/examples/CMakeLists.txt
index cc4509c..5c87e20 100644
--- a/bundles/remote_services/examples/CMakeLists.txt
+++ b/bundles/remote_services/examples/CMakeLists.txt
@@ -46,38 +46,3 @@ add_subdirectory(interceptors)
# BUNDLES org.apache.celix.calc.api.Calculator_proxy
# )
# endif ()
-
-
-if (BUILD_RSA_DISCOVERY_ETCD AND BUILD_RSA_REMOTE_SERVICE_ADMIN_DFI)
- add_celix_container(remote-services-dfi
- NAME "server"
- GROUP "remote-services/remote-services-dfi"
- BUNDLES
- Celix::rsa_discovery_etcd
- Celix::rsa_topology_manager
- Celix::rsa_dfi
- Celix::shell
- Celix::shell_tui
- Celix::log_admin
-
- celix_remote_interceptors_example
- calculator
- PROPERTIES
- RSA_PORT=18888
- )
-
- add_celix_container(remote-services-dfi-client
- NAME "client"
- GROUP "remote-services/remote-services-dfi"
- BUNDLES
- Celix::rsa_topology_manager
- Celix::rsa_dfi Celix::shell
- Celix::shell_tui
- Celix::log_admin
- Celix::rsa_discovery_etcd
- celix_remote_interceptors_example
- calculator_shell
- PROPERTIES
- RSA_PORT=28888
- )
-endif ()
