celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-417: Adds missing 'EXPORT celix' to some install_celix_bundle commands
Date Wed, 31 Jan 2018 11:08:08 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 398da49c7 -> 22f2d656c


CELIX-417: Adds missing 'EXPORT celix' to some install_celix_bundle commands


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/22f2d656
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/22f2d656
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/22f2d656

Branch: refs/heads/develop
Commit: 22f2d656c579a5111c0ccb0d81a1206539ad5464
Parents: 398da49
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Wed Jan 31 12:07:49 2018 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Wed Jan 31 12:07:49 2018 +0100

----------------------------------------------------------------------
 cmake/cmake_celix/DeployPackaging.cmake         |  7 ++----
 dependency_manager/readme.md                    |  2 +-
 dependency_manager_cxx/readme.md                |  2 +-
 deployment_admin/CMakeLists.txt                 |  9 ++++++--
 deployment_admin/README.md                      |  2 +-
 device_access/README.md                         |  4 ++--
 device_access/device_access/CMakeLists.txt      | 17 +++++++--------
 device_access/driver_locator/CMakeLists.txt     |  2 +-
 log_service/CMakeLists.txt                      | 23 ++++++--------------
 log_service/README.md                           |  2 +-
 log_writer/CMakeLists.txt                       |  5 +----
 log_writer/README.md                            |  2 +-
 log_writer/log_writer_stdout/CMakeLists.txt     |  3 ++-
 log_writer/log_writer_syslog/CMakeLists.txt     |  4 ++--
 pubsub/pubsub_admin_udp_mc/CMakeLists.txt       |  5 +----
 pubsub/pubsub_admin_zmq/CMakeLists.txt          |  2 +-
 pubsub/pubsub_discovery/CMakeLists.txt          |  5 ++---
 pubsub/pubsub_serializer_json/CMakeLists.txt    |  4 +---
 pubsub/pubsub_topology_manager/CMakeLists.txt   |  3 +--
 .../discovery_configured/CMakeLists.txt         |  3 +--
 remote_services/discovery_etcd/CMakeLists.txt   |  3 +--
 remote_services/discovery_shm/CMakeLists.txt    |  3 +--
 .../remote_service_admin_dfi/CMakeLists.txt     |  4 ++--
 .../remote_service_admin_shm/CMakeLists.txt     |  9 +++-----
 remote_services/topology_manager/CMakeLists.txt |  2 +-
 remote_shell/CMakeLists.txt                     |  2 +-
 shell/CMakeLists.txt                            |  8 ++-----
 shell/README.md                                 |  2 +-
 shell_tui/README.md                             |  2 +-
 29 files changed, 57 insertions(+), 84 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/cmake/cmake_celix/DeployPackaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/DeployPackaging.cmake b/cmake/cmake_celix/DeployPackaging.cmake
index b22ee40..be996df 100644
--- a/cmake/cmake_celix/DeployPackaging.cmake
+++ b/cmake/cmake_celix/DeployPackaging.cmake
@@ -131,15 +131,12 @@ $<JOIN:$<TARGET_PROPERTY:${CONTAINER_TARGET},CONTAINER_PROPERTIES>,
 
     #needed in the release.sh & run.sh files
     #Setting CELIX_LIB_DIRS, CELIX_BIN_DIR and CELIX_LAUNCHER
-    if (TARGET framework)
+    if (TARGET Celix::framework)
         #Celix Main Project
         set(CELIX_LIB_DIRS "$<TARGET_FILE_DIR:Celix::framework>:$<TARGET_FILE_DIR:Celix::utils>:$<TARGET_FILE_DIR:Celix::dfi>")
         set(CELIX_BIN_DIR  "$<TARGET_FILE_DIR:Celix::launcher>")
     else ()
-        #CELIX_FRAMEWORK_LIBRARY and CELIX_LAUNCHER set by FindCelix.cmake -> Celix Based
Project
-        get_filename_component(CELIX_LIB_DIR ${CELIX_FRAMEWORK_LIBRARY} DIRECTORY) #Note
assuming all celix libs are in the same dir
-        set(CELIX_LIB_DIRS "${CELIX_LIB_DIR}")
-        get_filename_component(CELIX_BIN_DIR ${CELIX_LAUNCHER} DIRECTORY)
+	message(FATAL_ERROR "No Celix::framework target is defined. Did you use find_package(Celix
REQUIRED)?")
     endif()
 
     #generate release.sh and optional run.sh

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/dependency_manager/readme.md
----------------------------------------------------------------------
diff --git a/dependency_manager/readme.md b/dependency_manager/readme.md
index d5c1b8a..8effe63 100644
--- a/dependency_manager/readme.md
+++ b/dependency_manager/readme.md
@@ -148,6 +148,6 @@ their state, provided interfaces and required interfaces.
 
 ## Using info
 
-If the Celix Dependency Manager is installed The `FindCelix.cmake` will set:
+If the Celix Dependency Manager is installed, 'find_package(Celix)' will set:
  - The `Celix::dm_shell` bundle target
  - The `Celix::dependency_manger_static` library target

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/dependency_manager_cxx/readme.md
----------------------------------------------------------------------
diff --git a/dependency_manager_cxx/readme.md b/dependency_manager_cxx/readme.md
index 1d9e8ef..5f80744 100644
--- a/dependency_manager_cxx/readme.md
+++ b/dependency_manager_cxx/readme.md
@@ -79,6 +79,6 @@ For more information examples please see
 
 ## Using info
 
-If the Celix C++ Dependency Manager is installed The `FindCelix.cmake` will set:
+If the Celix C++ Dependency Manager is installed, 'find_package(Celix)' will set:
  - The `Celix::shell_api` interface (i.e. headers only) library target
  - The `Celix::shell` bundle target

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/deployment_admin/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/deployment_admin/CMakeLists.txt b/deployment_admin/CMakeLists.txt
index 8d74b1f..b3f849f 100644
--- a/deployment_admin/CMakeLists.txt
+++ b/deployment_admin/CMakeLists.txt
@@ -23,7 +23,10 @@ if (DEPLOYMENT_ADMIN)
     find_package(ZLIB REQUIRED)
 
     add_library(deployment_admin_api INTERFACE)
-    target_include_directories(deployment_admin_api INTERFACE api)
+    target_include_directories(deployment_admin_api INTERFACE 
+	    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/api>
+	    $<INSTALL_INTERFACE:include/celix/deployment_admin>
+    )
 
     add_celix_bundle(deployment_admin
         SYMBOLIC_NAME "apache_celix_deployment_admin"
@@ -50,7 +53,9 @@ if (DEPLOYMENT_ADMIN)
     )
     target_link_libraries(deployment_admin PRIVATE ${CURL_LIBRARIES} ${UUID_LIBRARIES} ${ZLIB_LIBRARIES}
deployment_admin_api)
 
-    install_celix_bundle(deployment_admin)
+    install(TARGETS deployment_admin_api EXPORT celix COMPONENT deployment_admin)
+    install(DIRECTORY api/ DESTINATION include/celix/deployment_admin COMPONENT deployment_admin)
+    install_celix_bundle(deployment_admin EXPORT celix COMPONENT deployment_admin)
 
     #Setup target aliases to match external usage
     add_library(Celix::deployment_admin_api ALIAS deployment_admin_api)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/deployment_admin/README.md
----------------------------------------------------------------------
diff --git a/deployment_admin/README.md b/deployment_admin/README.md
index 193a6c6..72fe8e2 100644
--- a/deployment_admin/README.md
+++ b/deployment_admin/README.md
@@ -36,6 +36,6 @@ It can be used for example with Apache Ace, which allows you to centrally
manage
 
 ## Using info
 
-If the Celix Deployment Admin is installed The `FindCelix.cmake` will set:
+If the Celix Deployment Admin is installed, 'find_package(Celix)' will set:
  - The `Celix::deployment_admin_api` interface (i.e. headers only) library target
  - The `Celix::deployment_admin` bundle target

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/device_access/README.md
----------------------------------------------------------------------
diff --git a/device_access/README.md b/device_access/README.md
index 6ccc2f8..82aec62 100644
--- a/device_access/README.md
+++ b/device_access/README.md
@@ -28,7 +28,7 @@ The Device Access contains a for Celix adapted implementation of the OSGi
Compen
 
 ## Using info
 
-If the Celix Device Access is installed The `FindCelix.cmake` will set:
+If the Celix Device Access is installed, 'find_package(Celix)' will set:
  - The `Celix::device_access_api` interface (i.e. headers only) library target
  - The `Celix::device_manager` bundle target
- - The `Celix::driver_locator` bundle target
\ No newline at end of file
+ - The `Celix::driver_locator` bundle target

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/device_access/device_access/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/device_access/device_access/CMakeLists.txt b/device_access/device_access/CMakeLists.txt
index c39eb9b..cbe1e83 100644
--- a/device_access/device_access/CMakeLists.txt
+++ b/device_access/device_access/CMakeLists.txt
@@ -17,7 +17,10 @@
 
 
 add_library(device_access_api INTERFACE)
-target_include_directories(device_access_api INTERFACE include)
+target_include_directories(device_access_api INTERFACE 
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
+    $<INSTALL_INTERFACE:include/celix/device_access>
+)
 
 add_celix_bundle(device_manager
 	SYMBOLIC_NAME "apache_celix_device_manager"
@@ -32,19 +35,15 @@ add_celix_bundle(device_manager
 )
 target_link_libraries(device_manager PRIVATE Celix::log_helper)
 
-install_celix_bundle(device_manager
-	HEADERS
-		include/device.h
-		include/driver_locator.h
-		include/driver_selector.h
-		include/driver.h
-		include/match.h
-)
 target_include_directories(device_manager PRIVATE src)
 target_link_libraries(device_manager PRIVATE device_access_api)
 
 include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
 
+install(TARGETS device_access_api EXPORT celix COMPONENT device_access)
+install(DIRECTORY include/ DESTINATION include/celix/device_access COMPONENT device_access)
+install_celix_bundle(device_manager EXPORT celix COMPONENT device_access)
+
 #Setup target aliases to match external usage
 add_library(Celix::device_access_api ALIAS device_access_api)
 add_library(Celix::device_manager ALIAS device_manager)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/device_access/driver_locator/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/device_access/driver_locator/CMakeLists.txt b/device_access/driver_locator/CMakeLists.txt
index f7c679a..464ccbf 100644
--- a/device_access/driver_locator/CMakeLists.txt
+++ b/device_access/driver_locator/CMakeLists.txt
@@ -24,9 +24,9 @@ add_celix_bundle(driver_locator
 		src/driver_locator
 )
 
-install_celix_bundle(driver_locator)
 target_include_directories(driver_locator PRIVATE src)
 target_link_libraries(driver_locator PRIVATE Celix::device_access_api)
 
 #Setup target aliases to match external usage
+install_celix_bundle(driver_locator EPXORT celix COMPONENT device_access)
 add_library(Celix::driver_locator ALIAS driver_locator)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/log_service/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/log_service/CMakeLists.txt b/log_service/CMakeLists.txt
index ed737d9..a67ff1a 100644
--- a/log_service/CMakeLists.txt
+++ b/log_service/CMakeLists.txt
@@ -48,21 +48,12 @@ if (LOG_SERVICE)
 			src/log_service_activator
 			src/log_reader_service_impl
     )
-    
-    install_celix_bundle(log_service
-        HEADERS
-        	include/log_service.h
-        	include/log_reader_service.h
-        	include/log_listener.h
-        	include/log_entry.h
-		EXPORT celix
-    )
-
-	target_include_directories(log_service PRIVATE src)
-	target_link_libraries(log_service PRIVATE log_service_api)
+    target_include_directories(log_service PRIVATE src)
+    target_link_libraries(log_service PRIVATE log_service_api)
+    install_celix_bundle(log_service EXPORT celix COMPONENT log_service)
 
-	#Setup target aliases to match external usage
-	add_library(Celix::log_service_api ALIAS log_service_api)
-	add_library(Celix::log_service ALIAS log_service)
-	add_library(Celix::log_helper ALIAS log_helper)
+    #Setup target aliases to match external usage
+    add_library(Celix::log_service_api ALIAS log_service_api)
+    add_library(Celix::log_service ALIAS log_service)
+    add_library(Celix::log_helper ALIAS log_helper)
 endif (LOG_SERVICE)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/log_service/README.md
----------------------------------------------------------------------
diff --git a/log_service/README.md b/log_service/README.md
index 384a00e..53d2c3b 100644
--- a/log_service/README.md
+++ b/log_service/README.md
@@ -13,7 +13,7 @@ To ease the use of the Log Service, the [Log Helper](public/include/log_helper.h
 
 ## Using info
 
-If the Celix Log Service is installed The `FindCelix.cmake` will set:
+If the Celix Log Service is installed, 'find_package(Celix)' will set:
  - The `Celix::log_service_api` interface (i.e. header only) library target
  - The `Celix::log_service` bundle target
  - The `Celix::log_helper` static library target

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/log_writer/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/log_writer/CMakeLists.txt b/log_writer/CMakeLists.txt
index e44ef65..329de94 100644
--- a/log_writer/CMakeLists.txt
+++ b/log_writer/CMakeLists.txt
@@ -19,9 +19,6 @@ celix_subproject(LOG_WRITER "Option to enable building the Log Writer bundles"
O
 if (LOG_WRITER)
     add_subdirectory(log_writer)
     add_subdirectory(log_writer_stdout)
-  	add_subdirectory(log_writer_syslog)
+    add_subdirectory(log_writer_syslog)
 
-    #Setup target aliases to match external usage
-    add_library(Celix::log_writer_stdout ALIAS log_writer_stdout)
-    #add_library(Celix::log_writer_syslog ALIAS log_writer_syslog)
 endif (LOG_WRITER)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/log_writer/README.md
----------------------------------------------------------------------
diff --git a/log_writer/README.md b/log_writer/README.md
index 29aebcc..e2d5b34 100644
--- a/log_writer/README.md
+++ b/log_writer/README.md
@@ -8,6 +8,6 @@ The Celix Log Writers are components that read/listen to the Log Service and
pri
 
 ## Using info
 
-If the Celix Log Writers is installed The `FindCelix.cmake` will set:
+If the Celix Log Writers are installed `find_package(CELIX)` will set:
  - The `Celix::log_writer_stdout` bundle target
  - The `Celix::log_writer_syslog` bundle target

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/log_writer/log_writer_stdout/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/log_writer/log_writer_stdout/CMakeLists.txt b/log_writer/log_writer_stdout/CMakeLists.txt
index e4000dc..3fca8a1 100644
--- a/log_writer/log_writer_stdout/CMakeLists.txt
+++ b/log_writer/log_writer_stdout/CMakeLists.txt
@@ -22,7 +22,8 @@ add_celix_bundle(log_writer_stdout
 	SOURCES
 		src/log_writer_stdout
 )
+target_link_libraries(log_writer_stdout PRIVATE Celix::log_service_api log_writer_common)
 
 install_celix_bundle(log_writer_stdout EXPORT celix)
+add_library(Celix::log_writer_stdout ALIAS log_writer_stdout)
 
-target_link_libraries(log_writer_stdout PRIVATE Celix::log_service_api log_writer_common)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/log_writer/log_writer_syslog/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/log_writer/log_writer_syslog/CMakeLists.txt b/log_writer/log_writer_syslog/CMakeLists.txt
index 9ea3a68..9d2170d 100644
--- a/log_writer/log_writer_syslog/CMakeLists.txt
+++ b/log_writer/log_writer_syslog/CMakeLists.txt
@@ -25,8 +25,8 @@ if (LOG_WRITER_SYSLOG)
         SOURCES
             private/src/log_writer_syslog
     )
+    target_link_libraries(log_writer_syslog PRIVATE log_writer_common)
 
     install_celix_bundle(log_writer_syslog EXPORT celix)
-
-    target_link_libraries(log_writer_syslog PRIVATE log_writer_common)
+    add_library(Celix::log_writer_syslog ALIAS log_writer_syslog)
 endif (LOG_WRITER_SYSLOG)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/pubsub/pubsub_admin_udp_mc/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_admin_udp_mc/CMakeLists.txt b/pubsub/pubsub_admin_udp_mc/CMakeLists.txt
index 6981c87..42bd1b7 100644
--- a/pubsub/pubsub_admin_udp_mc/CMakeLists.txt
+++ b/pubsub/pubsub_admin_udp_mc/CMakeLists.txt
@@ -27,17 +27,14 @@ add_celix_bundle(celix_pubsub_admin_udp_multicast
         src/topic_publication.c
         src/large_udp.c
 )
-
-
 target_include_directories(celix_pubsub_admin_udp_multicast PRIVATE
 		src
 		${JANSSON_INCLUDE_DIR}
 )
-
 set_target_properties(celix_pubsub_admin_udp_multicast PROPERTIES INSTALL_RPATH "$ORIGIN")
 target_link_libraries(celix_pubsub_admin_udp_multicast PRIVATE Celix::pubsub_spi Celix::framework
Celix::dfi Celix::log_helper)
 
-install_celix_bundle(celix_pubsub_admin_udp_multicast)
+install_celix_bundle(celix_pubsub_admin_udp_multicast EXPORT celix COMPONENT pubsub)
 
 add_library(Celix::pubsub_admin_udp_multicast ALIAS celix_pubsub_admin_udp_multicast)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/pubsub/pubsub_admin_zmq/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_admin_zmq/CMakeLists.txt b/pubsub/pubsub_admin_zmq/CMakeLists.txt
index 65d2107..6b3ecfd 100644
--- a/pubsub/pubsub_admin_zmq/CMakeLists.txt
+++ b/pubsub/pubsub_admin_zmq/CMakeLists.txt
@@ -54,7 +54,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 		src
 	)
 
-	install_celix_bundle(celix_pubsub_admin_zmq)
+        install_celix_bundle(celix_pubsub_admin_zmq EXPORT celix COMPONENT pubsub)
 
 	add_library(Celix::pubsub_admin_zmq ALIAS celix_pubsub_admin_zmq)
 endif()

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/pubsub/pubsub_discovery/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_discovery/CMakeLists.txt b/pubsub/pubsub_discovery/CMakeLists.txt
index d034a70..03dfa31 100644
--- a/pubsub/pubsub_discovery/CMakeLists.txt
+++ b/pubsub/pubsub_discovery/CMakeLists.txt
@@ -28,14 +28,13 @@ add_celix_bundle(celix_pubsub_discovery_etcd
         src/etcd_watcher.c
         src/etcd_writer.c
 )
-
 target_include_directories(celix_pubsub_discovery_etcd PRIVATE
     src
 	${CURL_INCLUDE_DIR}
 	${JANSSON_INCLUDE_DIR}
 )
-
 target_link_libraries(celix_pubsub_discovery_etcd PRIVATE Celix::pubsub_spi Celix::framework
Celix::etcdlib_static ${CURL_LIBRARIES} ${JANSSON_LIBRARIES})
-install_celix_bundle(celix_pubsub_discovery_etcd)
+
+install_celix_bundle(celix_pubsub_discovery_etcd EXPORT celix COMPONENT pubsub)
 
 add_library(Celix::pubsub_discovery_etcd ALIAS celix_pubsub_discovery_etcd)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/pubsub/pubsub_serializer_json/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_serializer_json/CMakeLists.txt b/pubsub/pubsub_serializer_json/CMakeLists.txt
index 9a486f2..cacdf09 100644
--- a/pubsub/pubsub_serializer_json/CMakeLists.txt
+++ b/pubsub/pubsub_serializer_json/CMakeLists.txt
@@ -25,16 +25,14 @@ add_celix_bundle(celix_pubsub_serializer_json
 		src/ps_activator.c
 		src/pubsub_serializer_impl.c
 )
-
 target_include_directories(celix_pubsub_serializer_json PRIVATE
 	src
 	${JANSSON_INCLUDE_DIR}
 )
-
 set_target_properties(celix_pubsub_serializer_json PROPERTIES INSTALL_RPATH "$ORIGIN")
 target_link_libraries(celix_pubsub_serializer_json PRIVATE Celix::pubsub_spi Celix::framework
Celix::dfi ${JANSSON_LIBRARIES} Celix::log_helper)
 
-install_celix_bundle(celix_pubsub_serializer_json)
+install_celix_bundle(celix_pubsub_serializer_json EXPORT celix COMPONENT pubsub)
 
 add_library(Celix::pubsub_serializer_json ALIAS celix_pubsub_serializer_json)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/pubsub/pubsub_topology_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/pubsub_topology_manager/CMakeLists.txt b/pubsub/pubsub_topology_manager/CMakeLists.txt
index 181b30d..7ae00f6 100644
--- a/pubsub/pubsub_topology_manager/CMakeLists.txt
+++ b/pubsub/pubsub_topology_manager/CMakeLists.txt
@@ -24,14 +24,13 @@ add_celix_bundle(celix_pubsub_topology_manager
     	src/pubsub_topology_manager.h
 )
 target_link_libraries(celix_pubsub_topology_manager PRIVATE Celix::framework Celix::log_helper
Celix::pubsub_spi)
-
 get_target_property(DESC Celix::pubsub_spi TOPIC_INFO_DESCRIPTOR)
 celix_bundle_files(celix_pubsub_topology_manager
 	${DESC}
     DESTINATION "META-INF/descriptors/services"
 )
 
-install_celix_bundle(celix_pubsub_topology_manager)
+install_celix_bundle(celix_pubsub_topology_manager EXPORT celix COMPONENT pubsub)
 
 add_library(Celix::pubsub_topology_manager ALIAS celix_pubsub_topology_manager)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/remote_services/discovery_configured/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_configured/CMakeLists.txt b/remote_services/discovery_configured/CMakeLists.txt
index fe658ca..089d1bd 100644
--- a/remote_services/discovery_configured/CMakeLists.txt
+++ b/remote_services/discovery_configured/CMakeLists.txt
@@ -35,8 +35,7 @@ if (RSA_DISCOVERY_CONFIGURED)
     )
     target_link_libraries(rsa_discovery_configured PRIVATE ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES}
Celix::log_helper Celix::rsa_common)
 
-    install_celix_bundle(rsa_discovery_configured)
-
+    install_celix_bundle(rsa_discovery_configured EXPORT celix COMPONENT rsa)
     #Setup target aliases to match external usage
     add_library(Celix::rsa_discovery_configured ALIAS rsa_discovery_configured)
 endif (RSA_DISCOVERY_CONFIGURED)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/remote_services/discovery_etcd/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_etcd/CMakeLists.txt b/remote_services/discovery_etcd/CMakeLists.txt
index 776ad93..6200a81 100644
--- a/remote_services/discovery_etcd/CMakeLists.txt
+++ b/remote_services/discovery_etcd/CMakeLists.txt
@@ -42,8 +42,7 @@ if (RSA_DISCOVERY_ETCD)
 	)
 	target_link_libraries(rsa_discovery_etcd PRIVATE ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES}
${JANSSON_LIBRARIES})
 
-	install_celix_bundle(rsa_discovery_etcd)
-
+	install_celix_bundle(rsa_discovery_etcd EXPORT celix COMPONENT rsa)
 	#Setup target aliases to match external usage
 	add_library(Celix::rsa_discovery_etcd ALIAS rsa_discovery_etcd)
 endif (RSA_DISCOVERY_ETCD)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/remote_services/discovery_shm/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_shm/CMakeLists.txt b/remote_services/discovery_shm/CMakeLists.txt
index 5557ae9..28c1fd4 100644
--- a/remote_services/discovery_shm/CMakeLists.txt
+++ b/remote_services/discovery_shm/CMakeLists.txt
@@ -40,8 +40,7 @@ find_package(CURL REQUIRED)
 	)
 	target_link_libraries(rsa_discovery_shm PRIVATE Celix::framework ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES})
 
-	install_celix_bundle(rsa_discovery_shm)
-
+	install_celix_bundle(rsa_discovery_shm EXPORT celix COMPONENT rsa)
 
 	#Setup target aliases to match external usage
 	add_library(Celix::rsa_discovery_shm ALIAS rsa_discovery_shm)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/remote_services/remote_service_admin_dfi/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_dfi/CMakeLists.txt b/remote_services/remote_service_admin_dfi/CMakeLists.txt
index 349c3ef..1aba671 100644
--- a/remote_services/remote_service_admin_dfi/CMakeLists.txt
+++ b/remote_services/remote_service_admin_dfi/CMakeLists.txt
@@ -42,12 +42,12 @@ if (RSA_REMOTE_SERVICE_ADMIN_DFI)
             Celix::rsa_common
             ${CURL_LIBRARIES} ${JANSSON_LIBRARIES})
 
-    install_celix_bundle(rsa_dfi)
-
     if (ENABLE_TESTING)
         add_subdirectory(test)
     endif()
 
+
+    install_celix_bundle(rsa_dfi EXPORT celix COMPONENT rsa)
     #Setup target aliases to match external usage
     add_library(Celix::rsa_dfi ALIAS rsa_dfi)
 endif()

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/remote_services/remote_service_admin_shm/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_shm/CMakeLists.txt b/remote_services/remote_service_admin_shm/CMakeLists.txt
index 51105f0..11cda6a 100644
--- a/remote_services/remote_service_admin_shm/CMakeLists.txt
+++ b/remote_services/remote_service_admin_shm/CMakeLists.txt
@@ -41,14 +41,11 @@ if (RSA_REMOTE_SERVICE_ADMIN_SHM)
         ${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin/private/src/import_registration_impl
         ${PROJECT_SOURCE_DIR}/log_service/public/src/log_helper.c
 	)
-
-	install_celix_bundle(remote_service_admin_shm
-		HEADERS
-			${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_shm/public/include/remote_service_admin_shm.h
-	)
-
 	target_link_libraries(remote_service_admin_shm celix_framework)
 
+       install_celix_bundle(remote_service_admin_shm EXPORT celix COMPONENT rsa)
+       add_library(Celix::remote_service_admin_shm ALIAS remote_service_admin_shm)
+
 	if (ENABLE_TESTING)
              find_package(CppUTest REQUIRED)
 	     include_directories(${CPPUTEST_INCLUDE_DIR})

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/remote_services/topology_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/topology_manager/CMakeLists.txt b/remote_services/topology_manager/CMakeLists.txt
index 1e47c37..63066e0 100644
--- a/remote_services/topology_manager/CMakeLists.txt
+++ b/remote_services/topology_manager/CMakeLists.txt
@@ -30,7 +30,6 @@ if (RSA_TOPOLOGY_MANAGER)
     target_include_directories(rsa_topology_manager PRIVATE include)
     target_link_libraries(rsa_topology_manager PRIVATE Celix::log_helper Celix::rsa_spi)
 
-    install_celix_bundle(rsa_topology_manager)
 
     if (ENABLE_TESTING)
         find_package(CppUTest REQUIRED)
@@ -42,6 +41,7 @@ if (RSA_TOPOLOGY_MANAGER)
         add_subdirectory(tms_tst)
    endif (ENABLE_TESTING)
 
+    install_celix_bundle(rsa_topology_manager EXPORT celix COMPONENT rsa)
     #Setup target aliases to match external usage
     add_library(Celix::rsa_topology_manager ALIAS rsa_topology_manager)
 endif (RSA_TOPOLOGY_MANAGER)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/remote_shell/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_shell/CMakeLists.txt b/remote_shell/CMakeLists.txt
index cd9ed98..24a3080 100644
--- a/remote_shell/CMakeLists.txt
+++ b/remote_shell/CMakeLists.txt
@@ -30,13 +30,13 @@ if (REMOTE_SHELL)
 
 	target_include_directories(remote_shell PRIVATE src)
 	target_link_libraries(remote_shell PRIVATE log_helper)
-	install_celix_bundle(remote_shell)
 
     include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
     include_directories("${PROJECT_SOURCE_DIR}/log_service/public/include")
     
     target_link_libraries(remote_shell PRIVATE Celix::shell_api)
 
+        install_celix_bundle(remote_shell EXPORT celix COMPONENT remote_shell)
 	#Alias setup to match external usage
 	add_library(Celix::remote_shell ALIAS remote_shell)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/shell/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index 321a173..d127513 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -23,7 +23,7 @@ if (SHELL)
 			$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
 			$<INSTALL_INTERFACE:include/celix/shell>
 	)
-	install(TARGETS shell_api EXPORT celix)
+        install(TARGETS shell_api EXPORT celix COMPONENT shell)
 	install(DIRECTORY include/ DESTINATION include/celix/shell COMPONENT shell)
 
     add_celix_bundle(shell
@@ -46,11 +46,7 @@ if (SHELL)
 	target_include_directories(shell PRIVATE src ${CURL_INCLUDE_DIRS})
 	target_link_libraries(shell PRIVATE Celix::shell_api ${CURL_LIBRARIES} Celix::log_service_api
Celix::log_helper)
 
-	install_celix_bundle(shell
-    	HEADERS
-    		include/shell.h include/command.h include/shell_constants.h
-		EXPORT celix
-    )
+	install_celix_bundle(shell EXPORT celix COMPONENT shell)
 
 	#Setup target aliases to match external usage
 	add_library(Celix::shell_api ALIAS shell_api)

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/shell/README.md
----------------------------------------------------------------------
diff --git a/shell/README.md b/shell/README.md
index 08a3982..d9f38af 100644
--- a/shell/README.md
+++ b/shell/README.md
@@ -46,6 +46,6 @@ ANSI colors when printing info. default is true.
 
 ## Using info
 
-If the Celix Shell is installed The `FindCelix.cmake` will set:
+If the Celix Shell is installed, 'find_package(Celix)' will set:
  - The `Celix::shell_api` interface (i.e. header only) library target
  - The `Celix::shell` bundle target

http://git-wip-us.apache.org/repos/asf/celix/blob/22f2d656/shell_tui/README.md
----------------------------------------------------------------------
diff --git a/shell_tui/README.md b/shell_tui/README.md
index 318e08c..2b8984f 100644
--- a/shell_tui/README.md
+++ b/shell_tui/README.md
@@ -30,5 +30,5 @@ shell tui. Default is true if a TERM environment is set else false.
 
 ## Using info
 
-If the Celix Shell TUI is installed The `FindCelix.cmake` will set:
+If the Celix Shell TUI is installed, 'find_package(Celix)' will set:
  - The `Celix::shell_tui` bundle target if the shell_tui is installed


Mime
View raw message