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/09/11 14:56:03 UTC
[celix] branch develop updated: Added configurable openssl for
linking with celix (#49)
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 1755fbb Added configurable openssl for linking with celix (#49)
1755fbb is described below
commit 1755fbbf185d65bfc4c55cd71674ede3b7b7c35a
Author: dhbfischer <52...@users.noreply.github.com>
AuthorDate: Wed Sep 11 16:55:59 2019 +0200
Added configurable openssl for linking with celix (#49)
---
bundles/deployment_admin/CMakeLists.txt | 3 ++-
bundles/remote_services/discovery_configured/CMakeLists.txt | 3 ++-
bundles/remote_services/discovery_etcd/CMakeLists.txt | 3 ++-
bundles/remote_services/discovery_shm/CMakeLists.txt | 2 +-
bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt | 3 ++-
bundles/shell/shell/CMakeLists.txt | 3 ++-
libs/framework/CMakeLists.txt | 3 ++-
libs/framework/tst/CMakeLists.txt | 1 -
8 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/bundles/deployment_admin/CMakeLists.txt b/bundles/deployment_admin/CMakeLists.txt
index c1d23a6..08c7f0b 100644
--- a/bundles/deployment_admin/CMakeLists.txt
+++ b/bundles/deployment_admin/CMakeLists.txt
@@ -19,6 +19,7 @@ celix_subproject(DEPLOYMENT_ADMIN "Option to enable building the Deployment Admi
if (DEPLOYMENT_ADMIN)
find_package(CURL REQUIRED)
+ find_package(OpenSSL REQUIRED)
find_package(UUID REQUIRED)
find_package(ZLIB REQUIRED)
@@ -50,7 +51,7 @@ if (DEPLOYMENT_ADMIN)
)
target_compile_definitions(deployment_admin PRIVATE -DUSE_FILE32API)
- target_link_libraries(deployment_admin PRIVATE ${CURL_LIBRARY} ${UUID_LIBRARY} ${ZLIB_LIBRARIES} deployment_admin_api)
+ target_link_libraries(deployment_admin PRIVATE ${CURL_LIBRARY} ${UUID_LIBRARY} ${ZLIB_LIBRARIES} ${OPENSLL_LIBRARY} deployment_admin_api)
target_include_directories(deployment_admin PRIVATE ${CURL_INCLUDE_DIRS})
install(TARGETS deployment_admin_api EXPORT celix COMPONENT deployment_admin)
diff --git a/bundles/remote_services/discovery_configured/CMakeLists.txt b/bundles/remote_services/discovery_configured/CMakeLists.txt
index fbfbd5b..273fa2a 100644
--- a/bundles/remote_services/discovery_configured/CMakeLists.txt
+++ b/bundles/remote_services/discovery_configured/CMakeLists.txt
@@ -17,6 +17,7 @@
celix_subproject(RSA_DISCOVERY_CONFIGURED "Option to enable building the Discovery (Configured) bundle" ON)
if (RSA_DISCOVERY_CONFIGURED)
find_package(CURL REQUIRED)
+ find_package(OpenSSL REQUIRED)
find_package(LibXml2 REQUIRED)
add_celix_bundle(rsa_discovery_configured
@@ -33,7 +34,7 @@ if (RSA_DISCOVERY_CONFIGURED)
$<TARGET_PROPERTY:Celix::rsa_discovery_common,INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:Celix::civetweb,INCLUDE_DIRECTORIES>
)
- target_link_libraries(rsa_discovery_configured PRIVATE ${CURL_LIBRARY} ${LIBXML2_LIBRARIES} Celix::log_helper Celix::rsa_common)
+ target_link_libraries(rsa_discovery_configured PRIVATE ${CURL_LIBRARY} ${LIBXML2_LIBRARIES} ${OPENSSL_LIBRARY} Celix::log_helper Celix::rsa_common)
install_celix_bundle(rsa_discovery_configured EXPORT celix COMPONENT rsa)
#Setup target aliases to match external usage
diff --git a/bundles/remote_services/discovery_etcd/CMakeLists.txt b/bundles/remote_services/discovery_etcd/CMakeLists.txt
index d1d9e40..e8608d8 100644
--- a/bundles/remote_services/discovery_etcd/CMakeLists.txt
+++ b/bundles/remote_services/discovery_etcd/CMakeLists.txt
@@ -18,6 +18,7 @@
celix_subproject(RSA_DISCOVERY_ETCD "Option to enable building the Discovery (ETCD) bundle" ON)
if (RSA_DISCOVERY_ETCD)
find_package(CURL REQUIRED)
+ find_package(OpenSSL REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(Jansson REQUIRED)
@@ -43,7 +44,7 @@ if (RSA_DISCOVERY_ETCD)
${JANSSON_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR}
)
- target_link_libraries(rsa_discovery_etcd PRIVATE ${CURL_LIBRARY} ${LIBXML2_LIBRARIES} ${JANSSON_LIBRARIES})
+ target_link_libraries(rsa_discovery_etcd PRIVATE ${CURL_LIBRARY} ${LIBXML2_LIBRARIES} ${JANSSON_LIBRARIES} ${OPENSSL_LIBRARY})
install_celix_bundle(rsa_discovery_etcd EXPORT celix COMPONENT rsa)
#Setup target aliases to match external usage
diff --git a/bundles/remote_services/discovery_shm/CMakeLists.txt b/bundles/remote_services/discovery_shm/CMakeLists.txt
index 5da43a2..8ea0707 100644
--- a/bundles/remote_services/discovery_shm/CMakeLists.txt
+++ b/bundles/remote_services/discovery_shm/CMakeLists.txt
@@ -17,7 +17,7 @@
celix_subproject(RSA_DISCOVERY_SHM "Option to enable building the Discovery (SHM) bundle" OFF)
if (RSA_DISCOVERY_SHM)
-find_package(CURL REQUIRED)
+ find_package(CURL REQUIRED)
find_package(LibXml2 REQUIRED)
add_celix_bundle(rsa_discovery_shm
diff --git a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt
index bb06763..5679611 100644
--- a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt
+++ b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt
@@ -21,6 +21,7 @@ celix_subproject(RSA_REMOTE_SERVICE_ADMIN_DFI "Option to enable building the Rem
if (RSA_REMOTE_SERVICE_ADMIN_DFI)
find_package(CURL REQUIRED)
+ find_package(OpenSSL REQUIRED)
find_package(Jansson REQUIRED)
find_package(UUID REQUIRED)
@@ -50,7 +51,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_DFI)
Celix::dfi
Celix::log_helper
Celix::rsa_common
- ${CURL_LIBRARY} ${JANSSON_LIBRARIES})
+ ${CURL_LIBRARY} ${JANSSON_LIBRARIES} ${OPENSSL_LIBRARY})
if (ENABLE_TESTING)
add_subdirectory(test)
diff --git a/bundles/shell/shell/CMakeLists.txt b/bundles/shell/shell/CMakeLists.txt
index da45417..963e4ad 100644
--- a/bundles/shell/shell/CMakeLists.txt
+++ b/bundles/shell/shell/CMakeLists.txt
@@ -17,6 +17,7 @@
celix_subproject(SHELL "Option to enable building the Shell bundles" ON DEPS LAUNCHER LOG_SERVICE)
if (SHELL)
find_package(CURL REQUIRED)
+ find_package(OpenSSL REQUIRED)
add_library(shell_api INTERFACE)
target_include_directories(shell_api INTERFACE
@@ -47,7 +48,7 @@ if (SHELL)
)
target_include_directories(shell PRIVATE src)
target_include_directories(shell SYSTEM PRIVATE ${CURL_INCLUDE_DIRS})
- target_link_libraries(shell PRIVATE Celix::shell_api ${CURL_LIBRARY} Celix::log_service_api Celix::log_helper)
+ target_link_libraries(shell PRIVATE Celix::shell_api ${CURL_LIBRARY} ${OPENSSL_LIBRARY} Celix::log_service_api Celix::log_helper)
install_celix_bundle(shell EXPORT celix COMPONENT shell)
diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt
index 05f663d..6cdb1b9 100644
--- a/libs/framework/CMakeLists.txt
+++ b/libs/framework/CMakeLists.txt
@@ -18,6 +18,7 @@
find_package(ZLIB REQUIRED)
find_package(UUID REQUIRED)
find_package(CURL REQUIRED)
+find_package(OpenSSL REQUIRED)
if(NOT UUID_LIBRARY)
#i.e. not found for OSX
@@ -46,7 +47,7 @@ target_include_directories(framework PUBLIC
)
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 PUBLIC Celix::utils ${OPENSSL_LIBRARY})
target_link_libraries(framework PRIVATE ${UUID_LIBRARY} ${ZLIB_LIBRARY} ${CURL_LIBRARY})
target_include_directories(framework PRIVATE ${CURL_INCLUDE_DIR} ${UUID_INCLUDE_DIRS})
diff --git a/libs/framework/tst/CMakeLists.txt b/libs/framework/tst/CMakeLists.txt
index 7bf8af6..11788ff 100644
--- a/libs/framework/tst/CMakeLists.txt
+++ b/libs/framework/tst/CMakeLists.txt
@@ -31,7 +31,6 @@ add_executable(test_framework
)
target_link_libraries(test_framework Celix::framework ${CURL_LIBRARIES} ${CPPUTEST_LIBRARY})
-
add_dependencies(test_framework simple_test_bundle1_bundle simple_test_bundle2_bundle simple_test_bundle3_bundle simple_test_bundle4_bundle simple_test_bundle5_bundle)
target_include_directories(test_framework PRIVATE ../src)