Skip to content

Fix RSA CMake error #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 21, 2021
Merged

Fix RSA CMake error #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions bundles/remote_services/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


35 changes: 0 additions & 35 deletions bundles/remote_services/examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()