You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by bp...@apache.org on 2015/09/28 11:39:39 UTC
celix git commit: CELIX-260: added missing uuid includes
Repository: celix
Updated Branches:
refs/heads/develop 268ab022e -> a72cd6f5b
CELIX-260: added missing uuid includes
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/a72cd6f5
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/a72cd6f5
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/a72cd6f5
Branch: refs/heads/develop
Commit: a72cd6f5b9716aef7f0b032b60a29d0479a2e4ff
Parents: 268ab02
Author: Bjoern Petri <bp...@apache.org>
Authored: Mon Sep 28 11:39:13 2015 +0200
Committer: Bjoern Petri <bp...@apache.org>
Committed: Mon Sep 28 11:39:13 2015 +0200
----------------------------------------------------------------------
deployment_admin/CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/a72cd6f5/deployment_admin/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/deployment_admin/CMakeLists.txt b/deployment_admin/CMakeLists.txt
index cff425d..1f18ae2 100644
--- a/deployment_admin/CMakeLists.txt
+++ b/deployment_admin/CMakeLists.txt
@@ -18,7 +18,8 @@
celix_subproject(DEPLOYMENT_ADMIN "Option to enable building the Deployment Admin Service bundles" ON DEPS framework launcher shell_tui log_writer)
if (DEPLOYMENT_ADMIN)
- find_package(CURL REQUIRED)
+ find_package(CURL REQUIRED)
+ find_package(UUID REQUIRED)
add_definitions(-DUSE_FILE32API)
@@ -27,6 +28,7 @@ if (DEPLOYMENT_ADMIN)
SET_HEADERS("Bundle-Name: Apache Celix Deployment Admin")
include_directories("${CURL_INCLUDE_DIR}")
+ include_directories("${UUID_INCLUDE_DIR}")
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
include_directories("${PROJECT_SOURCE_DIR}/deployment_admin/private/include")
include_directories("${PROJECT_SOURCE_DIR}/deployment_admin/public/include")
@@ -58,5 +60,5 @@ if (DEPLOYMENT_ADMIN)
public/include/resource_processor.h
)
- target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES})
+ target_link_libraries(deployment_admin celix_framework ${CURL_LIBRARIES} ${UUID_LIBRARY})
endif (DEPLOYMENT_ADMIN)