[celix] branch develop updated: Added missing findpackage/include dirs. Include directories on host system where used iso those found with find package

[er...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

erjanaltena pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/develop by this push:
     new db4bd65  Added missing findpackage/include dirs. Include directories on host system where used iso those found with find package
db4bd65 is described below

commit db4bd656e44756609b1e59644f5a57ca4e55cf88
Author: Erjan Altena <er...@gmail.com>
AuthorDate: Mon May 6 10:35:34 2019 +0200

    Added missing findpackage/include dirs. Include directories on host system where used iso those found with find package
---
 bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt                  | 2 ++
 bundles/pubsub/pubsub_topology_manager/CMakeLists.txt           | 4 ++++
 bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt | 2 +-
 libs/framework/CMakeLists.txt                                   | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt b/bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt
index b960615..f7bac88 100644
--- a/bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt
+++ b/bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt
@@ -20,6 +20,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	find_package(ZMQ REQUIRED)
 	find_package(CZMQ REQUIRED)
 	find_package(Jansson REQUIRED)
+	find_package(UUID REQUIRED)
 
 	if (BUILD_ZMQ_SECURITY)
 		add_definitions(-DBUILD_WITH_ZMQ_SECURITY=1)
@@ -53,6 +54,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 		${ZMQ_INCLUDE_DIR}
 		${CZMQ_INCLUDE_DIR}
 		${JANSSON_INCLUDE_DIR}
+		${UUID_INCLUDE_DIRS}
 		src
 	)
 
diff --git a/bundles/pubsub/pubsub_topology_manager/CMakeLists.txt b/bundles/pubsub/pubsub_topology_manager/CMakeLists.txt
index ae18912..2ff659c 100644
--- a/bundles/pubsub/pubsub_topology_manager/CMakeLists.txt
+++ b/bundles/pubsub/pubsub_topology_manager/CMakeLists.txt
@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+find_package(UUID REQUIRED)
+
 add_celix_bundle(celix_pubsub_topology_manager
     BUNDLE_SYMBOLICNAME "apache_celix_pubsub_topology_manager"
     VERSION "1.0.0"
@@ -25,6 +27,8 @@ 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 Celix::shell_api)
+target_include_directories(celix_pubsub_topology_manager PRIVATE ${UUID_INCLUDE_DIRS})
+
 get_target_property(DESC Celix::pubsub_spi TOPIC_INFO_DESCRIPTOR)
 celix_bundle_files(celix_pubsub_topology_manager
 	${DESC}
diff --git a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt
index d241d7b..91037a4 100644
--- a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt
+++ b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt
@@ -40,7 +40,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_DFI)
     celix_bundle_private_libs(rsa_dfi Celix::dfi)
     target_include_directories(rsa_dfi PRIVATE $<TARGET_PROPERTY:Celix::civetweb,INCLUDE_DIRECTORIES>)
     #target_include_directories(rsa_dfi SYSTEM PRIVATE ${CURL_INCLUDE_DIRS} ${JANSSON_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS})
-    target_include_directories(rsa_dfi PRIVATE ${JANSSON_INCLUDE_DIRS})
+    target_include_directories(rsa_dfi PRIVATE ${JANSSON_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS})
     target_link_libraries(rsa_dfi PRIVATE
             Celix::dfi
             Celix::log_helper
diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt
index 29181e2..a404f2a 100644
--- a/libs/framework/CMakeLists.txt
+++ b/libs/framework/CMakeLists.txt
@@ -47,7 +47,7 @@ target_compile_options(framework PRIVATE -DUSE_FILE32API)
 set_target_properties(framework PROPERTIES "SOVERSION" 2)
 target_link_libraries(framework PUBLIC Celix::utils)
 target_link_libraries(framework PRIVATE ${UUID_LIBRARY} ${ZLIB_LIBRARY} ${CURL_LIBRARIES})
-
+target_include_directories(framework PRIVATE ${CURL_INCLUDE_DIR} ${UUID_INCLUDE_DIRS})
 install(TARGETS framework EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT framework)
 install(DIRECTORY include/ DESTINATION include/celix COMPONENT framework)