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/04/26 19:58:20 UTC
[celix] branch develop updated: CELIX-426: Updates UUID lib cmake
configuration for OSX
This is an automated email from the ASF dual-hosted git repository.
pnoltes 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 03e4257 CELIX-426: Updates UUID lib cmake configuration for OSX
03e4257 is described below
commit 03e4257ea257c7292236b7b314da58199c479fa2
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Fri Apr 26 21:57:53 2019 +0200
CELIX-426: Updates UUID lib cmake configuration for OSX
---
bundles/deployment_admin/CMakeLists.txt | 6 +++++-
libs/framework/CMakeLists.txt | 5 +++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/bundles/deployment_admin/CMakeLists.txt b/bundles/deployment_admin/CMakeLists.txt
index de7793d..9364fea 100644
--- a/bundles/deployment_admin/CMakeLists.txt
+++ b/bundles/deployment_admin/CMakeLists.txt
@@ -22,6 +22,10 @@ if (DEPLOYMENT_ADMIN)
find_package(UUID REQUIRED)
find_package(ZLIB REQUIRED)
+ if (NOT UUID_LIBRARY)
+ set(UUID_LIBRARY "")
+ endif ()
+
add_library(deployment_admin_api INTERFACE)
target_include_directories(deployment_admin_api INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/api>
@@ -46,7 +50,7 @@ if (DEPLOYMENT_ADMIN)
)
target_compile_definitions(deployment_admin PRIVATE -DUSE_FILE32API)
- target_link_libraries(deployment_admin PRIVATE ${CURL_LIBRARIES} ${UUID_LIBRARIES} ${ZLIB_LIBRARIES} deployment_admin_api)
+ target_link_libraries(deployment_admin PRIVATE ${CURL_LIBRARIES} ${UUID_LIBRARY} ${ZLIB_LIBRARIES} deployment_admin_api)
install(TARGETS deployment_admin_api EXPORT celix COMPONENT deployment_admin)
install(DIRECTORY api/ DESTINATION include/celix/deployment_admin COMPONENT deployment_admin)
diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt
index e853d22..29181e2 100644
--- a/libs/framework/CMakeLists.txt
+++ b/libs/framework/CMakeLists.txt
@@ -19,6 +19,11 @@ find_package(ZLIB REQUIRED)
find_package(UUID REQUIRED)
find_package(CURL REQUIRED)
+if(NOT UUID_LIBRARY)
+ #i.e. not found for OSX
+ set(UUID_LIBRARY "")
+endif()
+
set(SOURCES
src/attribute.c src/bundle.c src/bundle_archive.c src/bundle_cache.c
src/bundle_context.c src/bundle_revision.c src/capability.c src/celix_errorcodes.c