Skip to content
Permalink
Browse files
Fix RSA CMake error.
Break cyclic dependency between examples and other RSA tests.
  • Loading branch information
PengZheng authored and jermus67 committed Dec 22, 2021
1 parent 24d9517 commit a88cd64d7b687ecead12b4b3450ab0d44d8dbba0
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 35 deletions.
@@ -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)


@@ -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 ()

0 comments on commit a88cd64

Please sign in to comment.