celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rlenfer...@apache.org
Subject [1/2] celix git commit: Example pubsub executables now linked against celix libraries
Date Thu, 21 Dec 2017 15:16:28 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 5cc65060e -> 462d67970


Example pubsub executables now linked 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/e840c31b
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/e840c31b
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/e840c31b

Branch: refs/heads/develop
Commit: e840c31b93b184bf9f78a352ee764c44bfbf8c12
Parents: 5cc6506
Author: Roy Lenferink <lenferinkroy@gmail.com>
Authored: Thu Dec 21 16:14:36 2017 +0100
Committer: Roy Lenferink <lenferinkroy@gmail.com>
Committed: Thu Dec 21 16:14:36 2017 +0100

----------------------------------------------------------------------
 examples/dm_example_cxx/CMakeLists.txt | 41 ++++++++++++++---------------
 pubsub/deploy/CMakeLists.txt           | 24 ++++++++++++-----
 2 files changed, 37 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/e840c31b/examples/dm_example_cxx/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/dm_example_cxx/CMakeLists.txt b/examples/dm_example_cxx/CMakeLists.txt
index 9572142..b07f5cc 100644
--- a/examples/dm_example_cxx/CMakeLists.txt
+++ b/examples/dm_example_cxx/CMakeLists.txt
@@ -33,7 +33,7 @@ if (BUILD_DEPENDENCY_MANAGER_CXX)
 
     add_deploy("dm_example_cxx"
         COPY 
-	CXX
+        CXX
         BUNDLES
             shell
             shell_tui
@@ -50,26 +50,25 @@ if (BUILD_DEPENDENCY_MANAGER_CXX)
             LOGHELPER_ENABLE_STDOUT_FALLBACK=true
     )
 
-    if (ENABLE_DOCKER)
-        add_celix_docker(dm_exmpl_cxx
-            GROUP examples
-            BUNDLES_DIR /usr/share/bundles
-            WORKDIR /workspace
-            BUNDLES
-                shell
-                shell_tui
-                dm_shell
-                log_service
-                log_writer
+    add_celix_docker(dm_exmpl_cxx
+        CXX
+        GROUP examples
+        BUNDLES_DIR /usr/share/bundles
+        WORKDIR /workspace
+        BUNDLES
+            shell
+            shell_tui
+            dm_shell
+            log_service
+            log_writer
 
-                phase1_cxx
-                phase2a_cxx
-                phase2b_cxx
-                phase3_cxx
-                phase3_locking_cxx
-            PROPERTIES
-                LOGHELPER_ENABLE_STDOUT_FALLBACK=true
-        )
-    endif ()
+            phase1_cxx
+            phase2a_cxx
+            phase2b_cxx
+            phase3_cxx
+            phase3_locking_cxx
+        PROPERTIES
+            LOGHELPER_ENABLE_STDOUT_FALLBACK=true
+    )
 
 endif ()

http://git-wip-us.apache.org/repos/asf/celix/blob/e840c31b/pubsub/deploy/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/pubsub/deploy/CMakeLists.txt b/pubsub/deploy/CMakeLists.txt
index 5039aea..ddce160 100644
--- a/pubsub/deploy/CMakeLists.txt
+++ b/pubsub/deploy/CMakeLists.txt
@@ -31,6 +31,7 @@ add_deploy(pubsub_publisher_udp_mc
 	   org.apache.celix.pubsub_publisher.PoiPublisher
 	   org.apache.celix.pubsub_publisher.PoiPublisher2
 )
+target_link_libraries(pubsub_publisher_udp_mc PRIVATE celix_framework celix_utils celix_dfi)
 
 add_deploy("pubsub_subscriber_udp_mc"
 	GROUP "pubsub"
@@ -43,6 +44,7 @@ add_deploy("pubsub_subscriber_udp_mc"
 	   org.apache.celix.pubsub_admin.PubSubAdminUdpMc
 	   org.apache.celix.pubsub_subscriber.PoiSubscriber
 )
+target_link_libraries(pubsub_subscriber_udp_mc PRIVATE celix_framework celix_utils celix_dfi)
 
 add_deploy("pubsub_subscriber2_udp_mc"
 	GROUP "pubsub"
@@ -55,20 +57,21 @@ add_deploy("pubsub_subscriber2_udp_mc"
 	   org.apache.celix.pubsub_admin.PubSubAdminUdpMc
 	   org.apache.celix.pubsub_subscriber.PoiSubscriber
 )
+target_link_libraries(pubsub_subscriber2_udp_mc PRIVATE celix_framework celix_utils celix_dfi)
 
 if (ETCD_CMD AND XTERM_CMD)
 	#Runtime starting a publish and subscriber for udp mc
 	add_runtime(pubsub_rt_upd_mc
-			NAME udp_mc
-			GROUP pubsub
-			DEPLOYMENTS
+		NAME udp_mc
+		GROUP pubsub
+		DEPLOYMENTS
 			pubsub_publisher_udp_mc
 			pubsub_subscriber_udp_mc
 			pubsub_subscriber2_udp_mc
-			COMMANDS
+		COMMANDS
 			etcd
-			USE_TERM
-			)
+		USE_TERM
+	)
 endif ()
 
 if (BUILD_PUBSUB_PSA_ZMQ)
@@ -90,6 +93,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	       poi1.psa=zmq
 	       poi2.psa=udp
 	)
+	target_link_libraries(pubsub_publisher PRIVATE celix_framework celix_utils celix_dfi)
 
 	add_deploy("pubsub_subscriber"
 	    GROUP "pubsub"
@@ -106,6 +110,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	       poi1.psa=zmq
 	       poi2.psa=udp
 	)
+	target_link_libraries(pubsub_subscriber PRIVATE celix_framework celix_utils celix_dfi)
 
 	# ZMQ
 	add_deploy("pubsub_zmq"
@@ -120,6 +125,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	       org.apache.celix.pubsub_publisher.PoiPublisher
 	       org.apache.celix.pubsub_subscriber.PoiSubscriber
 	)
+	target_link_libraries(pubsub_zmq PRIVATE celix_framework celix_utils celix_dfi)
 
 	add_deploy("pubsub_publisher_zmq"
 	    GROUP "pubsub"
@@ -135,6 +141,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	   	PROPERTIES
 		    pubsub.scope=my_small_scope
 	)
+	target_link_libraries(pubsub_publisher_zmq PRIVATE celix_framework celix_utils celix_dfi)
 
 	add_deploy("pubsub_subscriber_zmq"
 	    GROUP "pubsub"
@@ -147,6 +154,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	       org.apache.celix.pubsub_admin.PubSubAdminZmq
 	       org.apache.celix.pubsub_subscriber.PoiSubscriber
 	)
+	target_link_libraries(pubsub_subscriber_zmq PRIVATE celix_framework celix_utils celix_dfi)
 
 	add_deploy("pubsub_subscriber2_zmq"
 	    GROUP "pubsub"
@@ -158,8 +166,8 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	       org.apache.celix.pubsub_topology_manager.PubSubTopologyManager
 	       org.apache.celix.pubsub_admin.PubSubAdminZmq
 	       org.apache.celix.pubsub_subscriber.PoiSubscriber
-
 	)
+	target_link_libraries(pubsub_subscriber2_zmq PRIVATE celix_framework celix_utils celix_dfi)
 
 	# ZMQ Multipart
 	add_deploy("pubsub_mp_subscriber_zmq"
@@ -173,6 +181,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	       org.apache.celix.pubsub_admin.PubSubAdminZmq
 	       org.apache.celix.pubsub_subscriber.MpSubscriber
 	)
+	target_link_libraries(pubsub_mp_subscriber_zmq PRIVATE celix_framework celix_utils celix_dfi)
 
 	add_deploy("pubsub_mp_publisher_zmq"
 	    GROUP "pubsub"
@@ -185,6 +194,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
 	   		org.apache.celix.pubsub_admin.PubSubAdminZmq
 	   		org.apache.celix.pubsub_publisher.MpPublisher
 	)
+	target_link_libraries(pubsub_mp_publisher_zmq PRIVATE celix_framework celix_utils celix_dfi)
 
 	if (ETCD_CMD AND XTERM_CMD)
 		#Runtime starting two bundles using both zmq and upd mc pubsub


Mime
View raw message