CELIX-237: Added missing lib to framework build. Update intall locations for some rsa headers
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/fa785c5e Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/fa785c5e Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/fa785c5e Branch: refs/heads/develop Commit: fa785c5e7a4806a7853d6b1e5dafffee04fc52a1 Parents: 2d6ef1b Author: Pepijn Noltes <pepijnnol...@gmail.com> Authored: Mon Sep 7 20:50:53 2015 +0200 Committer: Pepijn Noltes <pepijnnol...@gmail.com> Committed: Mon Sep 7 20:50:53 2015 +0200 ---------------------------------------------------------------------- framework/CMakeLists.txt | 3 ++- remote_services/remote_service_admin/CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/fa785c5e/framework/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index 429dd04..a69187a 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt @@ -21,6 +21,7 @@ if (FRAMEWORK) find_package(ZLIB REQUIRED) find_package(UUID REQUIRED) + find_package(CURL REQUIRED) include(CPackComponent) @@ -73,7 +74,7 @@ if (FRAMEWORK) if (WITH_APR) set(APR ${APR_LIBRARY}) endif() - target_link_libraries(celix_framework celix_utils ${UUID} ${ZLIB_LIBRARY} ${APR}) + target_link_libraries(celix_framework celix_utils ${UUID} ${ZLIB_LIBRARY} ${APR} ${CURL_LIBRARIES}) install(TARGETS celix_framework DESTINATION lib COMPONENT framework) FILE(GLOB files "public/include/*.h") http://git-wip-us.apache.org/repos/asf/celix/blob/fa785c5e/remote_services/remote_service_admin/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin/CMakeLists.txt b/remote_services/remote_service_admin/CMakeLists.txt index 30f1ba3..310dafa 100644 --- a/remote_services/remote_service_admin/CMakeLists.txt +++ b/remote_services/remote_service_admin/CMakeLists.txt @@ -26,8 +26,8 @@ install (FILES public/include/remote_proxy.h public/include/remote_service_admin.h public/include/endpoint_description.h - ../endpoint_listener/public/include/endpoint_listener.h - ../utils/public/include/remote_constants.h + public/include/endpoint_listener.h + public/include/remote_constants.h DESTINATION include/celix/remote_service_admin COMPONENT @@ -41,7 +41,7 @@ install (FILES remote_service_admin ) install (FILES - ${PROJECT_SOURCE_DIR}/remote_services/endpoint_listener/public/include/endpoint_listener.h + public/include/endpoint_listener.h DESTINATION include/celix/endpoint_listener COMPONENT