celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [30/54] [abbrv] celix git commit: CELIX-417: Fixes CMake linking setup for the rsa discovery bundles
Date Tue, 30 Jan 2018 19:30:14 GMT
CELIX-417: Fixes CMake linking setup for the rsa discovery bundles


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/5ecaa64f
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/5ecaa64f
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/5ecaa64f

Branch: refs/heads/develop
Commit: 5ecaa64f672d2bc741279c2b91afc4e5e8048441
Parents: 1836cf8
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Fri Nov 24 16:19:48 2017 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Fri Nov 24 16:19:48 2017 +0100

----------------------------------------------------------------------
 remote_services/discovery_configured/CMakeLists.txt | 2 +-
 remote_services/discovery_etcd/CMakeLists.txt       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/5ecaa64f/remote_services/discovery_configured/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_configured/CMakeLists.txt b/remote_services/discovery_configured/CMakeLists.txt
index bea485e..83b18c7 100644
--- a/remote_services/discovery_configured/CMakeLists.txt
+++ b/remote_services/discovery_configured/CMakeLists.txt
@@ -33,7 +33,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_LIBRARIES} ${LIBXML2_LIBRARIES}
Celix::log_helper)
+    target_link_libraries(rsa_discovery_configured PRIVATE ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES}
Celix::log_helper Celix::rsa_common)
 
     install_bundle(rsa_discovery_configured)
 

http://git-wip-us.apache.org/repos/asf/celix/blob/5ecaa64f/remote_services/discovery_etcd/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/discovery_etcd/CMakeLists.txt b/remote_services/discovery_etcd/CMakeLists.txt
index 19726fc..fe88532 100644
--- a/remote_services/discovery_etcd/CMakeLists.txt
+++ b/remote_services/discovery_etcd/CMakeLists.txt
@@ -31,7 +31,7 @@ if (RSA_DISCOVERY_ETCD)
 			$<TARGET_OBJECTS:Celix::rsa_discovery_common>
 			$<TARGET_OBJECTS:Celix::civetweb>
 	)
-	target_link_libraries(rsa_discovery_etcd PRIVATE Celix::log_helper Celix::etcdlib_static)
+    target_link_libraries(rsa_discovery_etcd PRIVATE Celix::log_helper Celix::etcdlib_static
Celix::rsa_common)
 	target_include_directories(rsa_discovery_etcd PRIVATE src)
 	target_include_directories(rsa_discovery_etcd PRIVATE
 			$<TARGET_PROPERTY:Celix::rsa_discovery_common,INCLUDE_DIRECTORIES>


Mime
View raw message