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 9eb532b #101: Fixes an issue with unused descriptor file for the
pubsub tm
9eb532b is described below
commit 9eb532b00ff910ae3ffdf77a1422b428f05962e2
Author: Pepijn Noltes <[email protected]>
AuthorDate: Mon Oct 14 12:39:38 2019 +0200
#101: Fixes an issue with unused descriptor file for the pubsub tm
---
bundles/pubsub/pubsub_spi/CMakeLists.txt | 3 ---
bundles/pubsub/pubsub_topology_manager/CMakeLists.txt | 6 ------
2 files changed, 9 deletions(-)
diff --git a/bundles/pubsub/pubsub_spi/CMakeLists.txt
b/bundles/pubsub/pubsub_spi/CMakeLists.txt
index 9ac6835..a19131c 100644
--- a/bundles/pubsub/pubsub_spi/CMakeLists.txt
+++ b/bundles/pubsub/pubsub_spi/CMakeLists.txt
@@ -31,9 +31,6 @@ target_include_directories(pubsub_spi PUBLIC
)
target_link_libraries(pubsub_spi PUBLIC Celix::framework Celix::pubsub_api)
-set_target_properties(pubsub_spi PROPERTIES TOPIC_INFO_DESCRIPTOR
${CMAKE_CURRENT_LIST_DIR}/include/pubsub_topic_info.descriptor)
-#TODO how to make this descriptor available for imported targets?
$<INSTALL_INTERFACE:include/celix/pubsub_spi/pubsub_topic_info.descriptor>
-
add_library(Celix::pubsub_spi ALIAS pubsub_spi)
install(TARGETS pubsub_spi EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT pubsub)
diff --git a/bundles/pubsub/pubsub_topology_manager/CMakeLists.txt
b/bundles/pubsub/pubsub_topology_manager/CMakeLists.txt
index 5d9058e..7caa48a 100644
--- a/bundles/pubsub/pubsub_topology_manager/CMakeLists.txt
+++ b/bundles/pubsub/pubsub_topology_manager/CMakeLists.txt
@@ -29,12 +29,6 @@ add_celix_bundle(celix_pubsub_topology_manager
target_link_libraries(celix_pubsub_topology_manager PRIVATE Celix::framework
Celix::log_helper Celix::pubsub_spi Celix::shell_api)
target_link_libraries(celix_pubsub_topology_manager PRIVATE UUID::lib)
-get_target_property(DESC Celix::pubsub_spi TOPIC_INFO_DESCRIPTOR)
-celix_bundle_files(celix_pubsub_topology_manager
- ${DESC}
- DESTINATION "META-INF/descriptors/services"
-)
-
install_celix_bundle(celix_pubsub_topology_manager EXPORT celix COMPONENT
pubsub)
add_library(Celix::pubsub_topology_manager ALIAS celix_pubsub_topology_manager)
