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 2017/02/06 18:34:16 UTC
[04/19] celix git commit: Pubsub targets linking against celix
libraries
Pubsub targets linking against celix libraries
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/45ecd64d
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/45ecd64d
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/45ecd64d
Branch: refs/heads/develop
Commit: 45ecd64d7b566e075ebb41f536a7e143d9d8189b
Parents: 51f0eb0
Author: Roy Lenferink <le...@gmail.com>
Authored: Mon Feb 6 17:38:11 2017 +0100
Committer: Roy Lenferink <le...@gmail.com>
Committed: Mon Feb 6 17:38:11 2017 +0100
----------------------------------------------------------------------
celix-pubsub/pubsub/CMakeLists.txt | 2 +-
celix-pubsub/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt | 2 ++
celix-pubsub/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt | 2 ++
celix-pubsub/pubsub/examples/pubsub/publisher/CMakeLists.txt | 2 ++
celix-pubsub/pubsub/examples/pubsub/publisher2/CMakeLists.txt | 2 +-
celix-pubsub/pubsub/examples/pubsub/subscriber/CMakeLists.txt | 2 ++
celix-pubsub/pubsub/pubsub_admin_udp_mc/CMakeLists.txt | 2 +-
celix-pubsub/pubsub/pubsub_admin_zmq/CMakeLists.txt | 2 +-
celix-pubsub/pubsub/pubsub_discovery/CMakeLists.txt | 3 +--
celix-pubsub/pubsub/pubsub_topology_manager/CMakeLists.txt | 1 +
10 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/45ecd64d/celix-pubsub/pubsub/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/celix-pubsub/pubsub/CMakeLists.txt b/celix-pubsub/pubsub/CMakeLists.txt
index 7da5184..6ca3090 100644
--- a/celix-pubsub/pubsub/CMakeLists.txt
+++ b/celix-pubsub/pubsub/CMakeLists.txt
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-celix_subproject(PUBSUB "Option to build the pubsub bundles" OFF)
+celix_subproject(PUBSUB "Option to build the pubsub bundles" OFF DEPS UTILS)
if (PUBSUB)
include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")
http://git-wip-us.apache.org/repos/asf/celix/blob/45ecd64d/celix-pubsub/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/celix-pubsub/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt b/celix-pubsub/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
index 36c2429..76a01f1 100644
--- a/celix-pubsub/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
+++ b/celix-pubsub/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
@@ -46,3 +46,5 @@ bundle_files(org.apache.celix.pubsub_publisher.MpPublisher
${PROJECT_SOURCE_DIR}/pubsub/examples/keys/subscriber/public
DESTINATION "META-INF/keys/subscriber"
)
+
+target_link_libraries(org.apache.celix.pubsub_publisher.MpPublisher celix_framework celix_utils)
http://git-wip-us.apache.org/repos/asf/celix/blob/45ecd64d/celix-pubsub/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/celix-pubsub/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt b/celix-pubsub/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
index 503a708..a77bb89 100644
--- a/celix-pubsub/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
+++ b/celix-pubsub/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
@@ -46,3 +46,5 @@ bundle_files(org.apache.celix.pubsub_subscriber.MpSubscriber
${PROJECT_SOURCE_DIR}/pubsub/examples/keys/publisher/public
DESTINATION "META-INF/keys/publisher"
)
+
+target_link_libraries(org.apache.celix.pubsub_subscriber.MpSubscriber celix_framework celix_utils)
http://git-wip-us.apache.org/repos/asf/celix/blob/45ecd64d/celix-pubsub/pubsub/examples/pubsub/publisher/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/celix-pubsub/pubsub/examples/pubsub/publisher/CMakeLists.txt b/celix-pubsub/pubsub/examples/pubsub/publisher/CMakeLists.txt
index 4a5feda..e35c137 100644
--- a/celix-pubsub/pubsub/examples/pubsub/publisher/CMakeLists.txt
+++ b/celix-pubsub/pubsub/examples/pubsub/publisher/CMakeLists.txt
@@ -50,3 +50,5 @@ bundle_files(org.apache.celix.pubsub_publisher.PoiPublisher
${PROJECT_SOURCE_DIR}/pubsub/examples/keys/subscriber/public
DESTINATION "META-INF/keys/subscriber"
)
+
+target_link_libraries(org.apache.celix.pubsub_publisher.PoiPublisher celix_framework celix_utils)
http://git-wip-us.apache.org/repos/asf/celix/blob/45ecd64d/celix-pubsub/pubsub/examples/pubsub/publisher2/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/celix-pubsub/pubsub/examples/pubsub/publisher2/CMakeLists.txt b/celix-pubsub/pubsub/examples/pubsub/publisher2/CMakeLists.txt
index 270a881..b83f7dd 100644
--- a/celix-pubsub/pubsub/examples/pubsub/publisher2/CMakeLists.txt
+++ b/celix-pubsub/pubsub/examples/pubsub/publisher2/CMakeLists.txt
@@ -51,4 +51,4 @@ bundle_files(org.apache.celix.pubsub_publisher.PoiPublisher2
DESTINATION "META-INF/keys/subscriber"
)
-
+target_link_libraries(org.apache.celix.pubsub_publisher.PoiPublisher2 celix_framework celix_utils)
http://git-wip-us.apache.org/repos/asf/celix/blob/45ecd64d/celix-pubsub/pubsub/examples/pubsub/subscriber/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/celix-pubsub/pubsub/examples/pubsub/subscriber/CMakeLists.txt b/celix-pubsub/pubsub/examples/pubsub/subscriber/CMakeLists.txt
index 047dbb7..7fd9fae 100644
--- a/celix-pubsub/pubsub/examples/pubsub/subscriber/CMakeLists.txt
+++ b/celix-pubsub/pubsub/examples/pubsub/subscriber/CMakeLists.txt
@@ -51,3 +51,5 @@ bundle_files(org.apache.celix.pubsub_subscriber.PoiSubscriber
${PROJECT_SOURCE_DIR}/pubsub/examples/keys/publisher/public
DESTINATION "META-INF/keys/publisher"
)
+
+target_link_libraries(org.apache.celix.pubsub_subscriber.PoiSubscriber celix_framework celix_utils)
http://git-wip-us.apache.org/repos/asf/celix/blob/45ecd64d/celix-pubsub/pubsub/pubsub_admin_udp_mc/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/celix-pubsub/pubsub/pubsub_admin_udp_mc/CMakeLists.txt b/celix-pubsub/pubsub/pubsub_admin_udp_mc/CMakeLists.txt
index 7c8f620..dd25b19 100644
--- a/celix-pubsub/pubsub/pubsub_admin_udp_mc/CMakeLists.txt
+++ b/celix-pubsub/pubsub/pubsub_admin_udp_mc/CMakeLists.txt
@@ -51,7 +51,7 @@ add_bundle(org.apache.celix.pubsub_admin.PubSubAdminUdpMc
)
set_target_properties(org.apache.celix.pubsub_admin.PubSubAdminUdpMc PROPERTIES INSTALL_RPATH "$ORIGIN")
-target_link_libraries(org.apache.celix.pubsub_admin.PubSubAdminUdpMc ${CELIX_LIBRARIES} ${JANSSON_LIBRARIES} ${SERIALIZER_LIBRARY})
+target_link_libraries(org.apache.celix.pubsub_admin.PubSubAdminUdpMc celix_framework celix_utils celix_dfi ${JANSSON_LIBRARIES} ${SERIALIZER_LIBRARY})
install_bundle(org.apache.celix.pubsub_admin.PubSubAdminUdpMc)
http://git-wip-us.apache.org/repos/asf/celix/blob/45ecd64d/celix-pubsub/pubsub/pubsub_admin_zmq/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/celix-pubsub/pubsub/pubsub_admin_zmq/CMakeLists.txt b/celix-pubsub/pubsub/pubsub_admin_zmq/CMakeLists.txt
index def6c32..f831416 100644
--- a/celix-pubsub/pubsub/pubsub_admin_zmq/CMakeLists.txt
+++ b/celix-pubsub/pubsub/pubsub_admin_zmq/CMakeLists.txt
@@ -65,6 +65,6 @@ add_bundle(org.apache.celix.pubsub_admin.PubSubAdmin
)
set_target_properties(org.apache.celix.pubsub_admin.PubSubAdmin PROPERTIES INSTALL_RPATH "$ORIGIN")
-target_link_libraries(org.apache.celix.pubsub_admin.PubSubAdmin ${CELIX_LIBRARIES} ${ZMQ_LIBRARIES} ${CZMQ_LIBRARIES} ${JANSSON_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARY} ${SERIALIZER_LIBRARY})
+target_link_libraries(org.apache.celix.pubsub_admin.PubSubAdmin celix_framework celix_utils celix_dfi ${ZMQ_LIBRARIES} ${CZMQ_LIBRARIES} ${JANSSON_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARY} ${SERIALIZER_LIBRARY})
install_bundle(org.apache.celix.pubsub_admin.PubSubAdmin)
http://git-wip-us.apache.org/repos/asf/celix/blob/45ecd64d/celix-pubsub/pubsub/pubsub_discovery/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/celix-pubsub/pubsub/pubsub_discovery/CMakeLists.txt b/celix-pubsub/pubsub/pubsub_discovery/CMakeLists.txt
index bf95368..ca39b85 100644
--- a/celix-pubsub/pubsub/pubsub_discovery/CMakeLists.txt
+++ b/celix-pubsub/pubsub/pubsub_discovery/CMakeLists.txt
@@ -38,6 +38,5 @@ add_bundle(org.apache.celix.pubsub_discovery.etcd.PubsubDiscovery
${PROJECT_SOURCE_DIR}/pubsub/pubsub_common/public/src/etcd.c
)
+target_link_libraries(org.apache.celix.pubsub_discovery.etcd.PubsubDiscovery celix_framework celix_utils ${CURL_LIBRARIES} ${JANSSON_LIBRARIES})
install_bundle(org.apache.celix.pubsub_discovery.etcd.PubsubDiscovery)
-
-target_link_libraries(org.apache.celix.pubsub_discovery.etcd.PubsubDiscovery ${CURL_LIBRARIES} ${JANSSON_LIBRARIES})
http://git-wip-us.apache.org/repos/asf/celix/blob/45ecd64d/celix-pubsub/pubsub/pubsub_topology_manager/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/celix-pubsub/pubsub/pubsub_topology_manager/CMakeLists.txt b/celix-pubsub/pubsub/pubsub_topology_manager/CMakeLists.txt
index 02540f3..76eef19 100644
--- a/celix-pubsub/pubsub/pubsub_topology_manager/CMakeLists.txt
+++ b/celix-pubsub/pubsub/pubsub_topology_manager/CMakeLists.txt
@@ -39,5 +39,6 @@ bundle_files(org.apache.celix.pubsub_topology_manager.PubSubTopologyManager
DESTINATION "META-INF/"
)
+target_link_libraries(org.apache.celix.pubsub_topology_manager.PubSubTopologyManager celix_framework celix_utils)
install_bundle(org.apache.celix.pubsub_topology_manager.PubSubTopologyManager)