You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2019/02/05 13:10:35 UTC
[celix] branch feature/CELIX-459-pubsub-hums updated: Fixes target
include setup for UUID
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/CELIX-459-pubsub-hums
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/CELIX-459-pubsub-hums by this push:
new 06dbde1 Fixes target include setup for UUID
06dbde1 is described below
commit 06dbde1d55132a77b8a96df3743d96cd7d9d875a
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Tue Feb 5 14:10:12 2019 +0100
Fixes target include setup for UUID
---
bundles/pubsub/pubsub_spi/CMakeLists.txt | 3 +++
bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt | 3 ++-
bundles/remote_services/remote_service_admin_shm/CMakeLists.txt | 5 +++++
libs/framework/CMakeLists.txt | 6 +++---
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/bundles/pubsub/pubsub_spi/CMakeLists.txt b/bundles/pubsub/pubsub_spi/CMakeLists.txt
index 6ce8ab1..76b228d 100644
--- a/bundles/pubsub/pubsub_spi/CMakeLists.txt
+++ b/bundles/pubsub/pubsub_spi/CMakeLists.txt
@@ -15,12 +15,15 @@
# specific language governing permissions and limitations
# under the License.
+find_package(UUID REQUIRED)
+
add_library(pubsub_spi STATIC
src/pubsub_utils_match.c
src/pubsub_endpoint.c
src/pubsub_utils.c
src/pubsub_admin_metrics.c
)
+target_include_directories(pubsub_spi SYSTEM PRIVATE ${UUID_INCLUDE_DIRS})
set_target_properties(pubsub_spi PROPERTIES OUTPUT_NAME "celix_pubsub_spi")
target_include_directories(pubsub_spi PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
diff --git a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt
index 480768b..ac53eb2 100644
--- a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt
+++ b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt
@@ -22,6 +22,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_DFI)
find_package(CURL REQUIRED)
find_package(Jansson REQUIRED)
+ find_package(UUID REQUIRED)
add_celix_bundle(rsa_dfi
VERSION 0.9.0
@@ -38,7 +39,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_DFI)
)
celix_bundle_private_libs(rsa_dfi Celix::dfi)
target_include_directories(rsa_dfi PRIVATE src $<TARGET_PROPERTY:Celix::civetweb,INCLUDE_DIRECTORIES>)
- target_include_directories(rsa_dfi SYSTEM PRIVATE ${CURL_INCLUDE_DIRS} ${JANSSON_INCLUDE_DIRS})
+ target_include_directories(rsa_dfi SYSTEM PRIVATE ${CURL_INCLUDE_DIRS} ${JANSSON_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS})
target_link_libraries(rsa_dfi PRIVATE
Celix::dfi
Celix::log_helper
diff --git a/bundles/remote_services/remote_service_admin_shm/CMakeLists.txt b/bundles/remote_services/remote_service_admin_shm/CMakeLists.txt
index 3770ebf..a5a708b 100644
--- a/bundles/remote_services/remote_service_admin_shm/CMakeLists.txt
+++ b/bundles/remote_services/remote_service_admin_shm/CMakeLists.txt
@@ -16,6 +16,10 @@
# under the License.
celix_subproject(RSA_REMOTE_SERVICE_ADMIN_SHM "Option to enable building the Remote Service Admin Service SHM bundle" OFF)
if (RSA_REMOTE_SERVICE_ADMIN_SHM)
+
+ find_package(UUID REQUIRED)
+
+
link_directories("/opt/local/lib")
include_directories("/opt/local/include")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
@@ -28,6 +32,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_SHM)
include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_shm/public/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/remote_service_admin_shm/private/include")
include_directories("${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include")
+ include_directories(${UUID_INCLUDE_DIRS})
add_celix_bundle(remote_service_admin_shm
VERSION 0.9.0
diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt
index 348f106..9d81c91 100644
--- a/libs/framework/CMakeLists.txt
+++ b/libs/framework/CMakeLists.txt
@@ -45,9 +45,9 @@ target_include_directories(framework PUBLIC
)
target_include_directories(framework PRIVATE src)
target_include_directories(framework SYSTEM PRIVATE
- ${ZLIB_INCLUDE_DIR}
- ${CURL_INCLUDE_DIR}
- ${UUID_INCLUDE_DIR}
+ ${ZLIB_INCLUDE_DIRS}
+ ${CURL_INCLUDE_DIRS}
+ ${UUID_INCLUDE_DIRS}
)
target_compile_definitions(framework PRIVATE -DUSE_FILE32API)