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 2018/05/28 08:37:18 UTC
celix git commit: CELIX-424: Fixes resources cmake configuration for
pubsub
Repository: celix
Updated Branches:
refs/heads/develop 3bce889bc -> afcfea11c
CELIX-424: Fixes resources cmake configuration for pubsub
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/afcfea11
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/afcfea11
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/afcfea11
Branch: refs/heads/develop
Commit: afcfea11c3559a4312b8405452fde87b52662fae
Parents: 3bce889
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Mon May 28 10:36:51 2018 +0200
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Mon May 28 10:36:51 2018 +0200
----------------------------------------------------------------------
.../pubsub/examples/mp_pubsub/publisher/CMakeLists.txt | 10 +++++-----
.../pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt | 10 +++++-----
bundles/pubsub/examples/pubsub/publisher/CMakeLists.txt | 12 ++++++------
.../pubsub/examples/pubsub/publisher2/CMakeLists.txt | 12 ++++++------
.../pubsub/examples/pubsub/subscriber/CMakeLists.txt | 12 ++++++------
5 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/afcfea11/bundles/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bundles/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt b/bundles/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
index 653387e..76c9bce 100644
--- a/bundles/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
+++ b/bundles/pubsub/examples/mp_pubsub/publisher/CMakeLists.txt
@@ -26,18 +26,18 @@ target_link_libraries(org.apache.celix.pubsub_publisher.MpPublisher PRIVATE Celi
target_include_directories(org.apache.celix.pubsub_publisher.MpPublisher PRIVATE private/include)
celix_bundle_files(org.apache.celix.pubsub_publisher.MpPublisher
- ${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/msg_descriptors/msg_ew.descriptor
- ${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/msg_descriptors/msg_ide.descriptor
- ${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/msg_descriptors/msg_kinematics.descriptor
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/mp_pubsub/msg_descriptors/msg_ew.descriptor
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/mp_pubsub/msg_descriptors/msg_ide.descriptor
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/mp_pubsub/msg_descriptors/msg_kinematics.descriptor
DESTINATION "META-INF/descriptors"
)
celix_bundle_files(org.apache.celix.pubsub_publisher.MpPublisher
- ${PROJECT_SOURCE_DIR}/pubsub/examples/keys/publisher
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/keys/publisher
DESTINATION "META-INF/keys"
)
celix_bundle_files(org.apache.celix.pubsub_publisher.MpPublisher
- ${PROJECT_SOURCE_DIR}/pubsub/examples/keys/subscriber/public
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/keys/subscriber/public
DESTINATION "META-INF/keys/subscriber"
)
http://git-wip-us.apache.org/repos/asf/celix/blob/afcfea11/bundles/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bundles/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt b/bundles/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
index 1185ec5..444764e 100644
--- a/bundles/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
+++ b/bundles/pubsub/examples/mp_pubsub/subscriber/CMakeLists.txt
@@ -26,18 +26,18 @@ target_link_libraries(org.apache.celix.pubsub_subscriber.MpSubscriber PRIVATE Ce
target_include_directories(org.apache.celix.pubsub_subscriber.MpSubscriber PRIVATE private/include)
celix_bundle_files( org.apache.celix.pubsub_subscriber.MpSubscriber
- ${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/msg_descriptors/msg_ew.descriptor
- ${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/msg_descriptors/msg_ide.descriptor
- ${PROJECT_SOURCE_DIR}/pubsub/examples/mp_pubsub/msg_descriptors/msg_kinematics.descriptor
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/mp_pubsub/msg_descriptors/msg_ew.descriptor
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/mp_pubsub/msg_descriptors/msg_ide.descriptor
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/mp_pubsub/msg_descriptors/msg_kinematics.descriptor
DESTINATION "META-INF/descriptors"
)
celix_bundle_files(org.apache.celix.pubsub_subscriber.MpSubscriber
- ${PROJECT_SOURCE_DIR}/pubsub/examples/keys/subscriber
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/keys/subscriber
DESTINATION "META-INF/keys"
)
celix_bundle_files(org.apache.celix.pubsub_subscriber.MpSubscriber
- ${PROJECT_SOURCE_DIR}/pubsub/examples/keys/publisher/public
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/keys/publisher/public
DESTINATION "META-INF/keys/publisher"
)
http://git-wip-us.apache.org/repos/asf/celix/blob/afcfea11/bundles/pubsub/examples/pubsub/publisher/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bundles/pubsub/examples/pubsub/publisher/CMakeLists.txt b/bundles/pubsub/examples/pubsub/publisher/CMakeLists.txt
index 176a57e..00b528c 100644
--- a/bundles/pubsub/examples/pubsub/publisher/CMakeLists.txt
+++ b/bundles/pubsub/examples/pubsub/publisher/CMakeLists.txt
@@ -27,23 +27,23 @@ target_link_libraries(celix_pubsub_poi_publisher PRIVATE Celix::framework Celix:
target_include_directories(celix_pubsub_poi_publisher PRIVATE private/include)
celix_bundle_files(celix_pubsub_poi_publisher
- ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/msg_poi1.descriptor
- ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/msg_poi2.descriptor
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/msg_poi1.descriptor
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/msg_poi2.descriptor
DESTINATION "META-INF/descriptors"
)
celix_bundle_files(celix_pubsub_poi_publisher
- ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/poi1.properties
- ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/poi2.properties
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/poi1.properties
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/poi2.properties
DESTINATION "META-INF/topics/pub"
)
celix_bundle_files(celix_pubsub_poi_publisher
- ${PROJECT_SOURCE_DIR}/pubsub/examples/keys/publisher
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/keys/publisher
DESTINATION "META-INF/keys"
)
celix_bundle_files(celix_pubsub_poi_publisher
- ${PROJECT_SOURCE_DIR}/pubsub/examples/keys/subscriber/public
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/keys/subscriber/public
DESTINATION "META-INF/keys/subscriber"
)
http://git-wip-us.apache.org/repos/asf/celix/blob/afcfea11/bundles/pubsub/examples/pubsub/publisher2/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bundles/pubsub/examples/pubsub/publisher2/CMakeLists.txt b/bundles/pubsub/examples/pubsub/publisher2/CMakeLists.txt
index 30d86ee..e59d793 100644
--- a/bundles/pubsub/examples/pubsub/publisher2/CMakeLists.txt
+++ b/bundles/pubsub/examples/pubsub/publisher2/CMakeLists.txt
@@ -27,24 +27,24 @@ target_include_directories(celix_pubsub_poi_publisher2 PRIVATE ../publisher/priv
celix_bundle_files(celix_pubsub_poi_publisher2
- ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/msg_poi1.descriptor
- ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/msg_poi2.descriptor
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/msg_poi1.descriptor
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/msg_poi2.descriptor
DESTINATION "META-INF/descriptors"
)
celix_bundle_files(celix_pubsub_poi_publisher2
- ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/poi1.properties
- ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/poi2.properties
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/poi1.properties
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/poi2.properties
DESTINATION "META-INF/topics/pub"
)
celix_bundle_files(celix_pubsub_poi_publisher2
- ${PROJECT_SOURCE_DIR}/pubsub/examples/keys/publisher
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/keys/publisher
DESTINATION "META-INF/keys"
)
celix_bundle_files(celix_pubsub_poi_publisher2
- ${PROJECT_SOURCE_DIR}/pubsub/examples/keys/subscriber/public
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/keys/subscriber/public
DESTINATION "META-INF/keys/subscriber"
)
http://git-wip-us.apache.org/repos/asf/celix/blob/afcfea11/bundles/pubsub/examples/pubsub/subscriber/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bundles/pubsub/examples/pubsub/subscriber/CMakeLists.txt b/bundles/pubsub/examples/pubsub/subscriber/CMakeLists.txt
index 0eb13ff..05afa04 100644
--- a/bundles/pubsub/examples/pubsub/subscriber/CMakeLists.txt
+++ b/bundles/pubsub/examples/pubsub/subscriber/CMakeLists.txt
@@ -28,23 +28,23 @@ target_include_directories(celix_pubsub_poi_subscriber PRIVATE private/include)
celix_bundle_files(celix_pubsub_poi_subscriber
- ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/msg_poi1.descriptor
- ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/msg_poi2.descriptor
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/msg_poi1.descriptor
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/msg_poi2.descriptor
DESTINATION "META-INF/descriptors"
)
celix_bundle_files(celix_pubsub_poi_subscriber
- ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/poi1.properties
- ${PROJECT_SOURCE_DIR}/pubsub/examples/pubsub/msg_descriptors/poi2.properties
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/poi1.properties
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/pubsub/msg_descriptors/poi2.properties
DESTINATION "META-INF/topics/sub"
)
celix_bundle_files(celix_pubsub_poi_subscriber
- ${PROJECT_SOURCE_DIR}/pubsub/examples/keys/subscriber
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/keys/subscriber
DESTINATION "META-INF/keys"
)
celix_bundle_files(celix_pubsub_poi_subscriber
- ${PROJECT_SOURCE_DIR}/pubsub/examples/keys/publisher/public
+ ${PROJECT_SOURCE_DIR}/bundles/pubsub/examples/keys/publisher/public
DESTINATION "META-INF/keys/publisher"
)