CELIX-417: Fixes issues with the order of Cmake add_subdirectory for remote services
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/0c64ca6a Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/0c64ca6a Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/0c64ca6a Branch: refs/heads/develop Commit: 0c64ca6a1a97b6f997d1d7773d1c53c79c102bbd Parents: 0ea8de6 Author: Pepijn Noltes <[email protected]> Authored: Sat Jan 27 13:47:27 2018 +0100 Committer: Pepijn Noltes <[email protected]> Committed: Sat Jan 27 13:47:27 2018 +0100 ---------------------------------------------------------------------- remote_services/CMakeLists.txt | 5 ++--- remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/0c64ca6a/remote_services/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/CMakeLists.txt b/remote_services/CMakeLists.txt index ae27849..991d94a 100644 --- a/remote_services/CMakeLists.txt +++ b/remote_services/CMakeLists.txt @@ -17,11 +17,11 @@ celix_subproject(REMOTE_SERVICE_ADMIN "Option to enable building the Remote Service Admin Service bundles" OFF) if (REMOTE_SERVICE_ADMIN) - add_subdirectory(remote_services_api) + add_subdirectory(examples) + add_subdirectory(rsa_spi) add_subdirectory(rsa_common) - add_subdirectory(civetweb) add_subdirectory(topology_manager) @@ -35,7 +35,6 @@ if (REMOTE_SERVICE_ADMIN) #add_subdirectory(remote_service_admin_shm) add_subdirectory(remote_service_admin_dfi) - add_subdirectory(examples) endif (REMOTE_SERVICE_ADMIN) http://git-wip-us.apache.org/repos/asf/celix/blob/0c64ca6a/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt b/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt index c9a9d62..15536e0 100644 --- a/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt +++ b/remote_services/topology_manager/tms_tst/bundle/CMakeLists.txt @@ -27,7 +27,7 @@ add_celix_bundle(topology_manager_test_bundle SOURCES tst_activator.c ) -celix_celix_bundle_files(topology_manager_test_bundle +celix_bundle_files(topology_manager_test_bundle org.apache.celix.test.MyBundle.descriptor DESTINATION . )
