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/12/09 20:12:13 UTC
[celix] branch develop updated: #128: removes unneeded find package
for openssl.
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 3533885 #128: removes unneeded find package for openssl.
3533885 is described below
commit 35338853192e95ee4a8744211b71ef9e77131d5b
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Mon Dec 9 21:11:50 2019 +0100
#128: removes unneeded find package for openssl.
---
bundles/deployment_admin/CMakeLists.txt | 1 -
bundles/pubsub/examples/pubsub/publisher_websocket/CMakeLists.txt | 3 +--
bundles/remote_services/discovery_configured/CMakeLists.txt | 1 -
bundles/remote_services/discovery_etcd/CMakeLists.txt | 1 -
bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt | 1 -
libs/framework/CMakeLists.txt | 1 -
6 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/bundles/deployment_admin/CMakeLists.txt b/bundles/deployment_admin/CMakeLists.txt
index 5bc52a9..8d44c99 100644
--- a/bundles/deployment_admin/CMakeLists.txt
+++ b/bundles/deployment_admin/CMakeLists.txt
@@ -19,7 +19,6 @@ 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)
diff --git a/bundles/pubsub/examples/pubsub/publisher_websocket/CMakeLists.txt b/bundles/pubsub/examples/pubsub/publisher_websocket/CMakeLists.txt
index d4d5290..3e407fa 100644
--- a/bundles/pubsub/examples/pubsub/publisher_websocket/CMakeLists.txt
+++ b/bundles/pubsub/examples/pubsub/publisher_websocket/CMakeLists.txt
@@ -17,7 +17,6 @@
find_package(CURL REQUIRED)
-find_package(OpenSSL REQUIRED)
add_celix_bundle(celix_pubsub_websocket_publisher
@@ -27,7 +26,7 @@ add_celix_bundle(celix_pubsub_websocket_publisher
../publisher/private/src/ps_pub_activator.c
../publisher/private/src/pubsub_publisher.c
)
-target_link_libraries(celix_pubsub_websocket_publisher PRIVATE Celix::framework Celix::pubsub_api ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
+target_link_libraries(celix_pubsub_websocket_publisher PRIVATE Celix::framework Celix::pubsub_api ${CURL_LIBRARIES})
target_include_directories(celix_pubsub_websocket_publisher PRIVATE ../publisher/private/include)
diff --git a/bundles/remote_services/discovery_configured/CMakeLists.txt b/bundles/remote_services/discovery_configured/CMakeLists.txt
index 15bb1d4..25dd5f1 100644
--- a/bundles/remote_services/discovery_configured/CMakeLists.txt
+++ b/bundles/remote_services/discovery_configured/CMakeLists.txt
@@ -17,7 +17,6 @@
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
diff --git a/bundles/remote_services/discovery_etcd/CMakeLists.txt b/bundles/remote_services/discovery_etcd/CMakeLists.txt
index 41e6f83..77f54dc 100644
--- a/bundles/remote_services/discovery_etcd/CMakeLists.txt
+++ b/bundles/remote_services/discovery_etcd/CMakeLists.txt
@@ -18,7 +18,6 @@
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)
diff --git a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt
index eccf62c..3aa1936 100644
--- a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt
+++ b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt
@@ -21,7 +21,6 @@ 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)
diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt
index 88a8d08..1946eb8 100644
--- a/libs/framework/CMakeLists.txt
+++ b/libs/framework/CMakeLists.txt
@@ -18,7 +18,6 @@
find_package(ZLIB REQUIRED)
find_package(UUID REQUIRED)
find_package(CURL REQUIRED)
-find_package(OpenSSL REQUIRED)
set(SOURCES
src/attribute.c src/bundle.c src/bundle_archive.c src/bundle_cache.c