This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch hotfix/alias_and_ci_issues in repository https://gitbox.apache.org/repos/asf/celix.git
commit 8d0ce27f2c8a2bafd10c5573a87435e41e02cf8d Author: Pepijn Noltes <[email protected]> AuthorDate: Sun Aug 8 14:29:21 2021 +0200 Removes use of cmake target alias in CelixConfig. --- bundles/pubsub/CMakeLists.txt | 6 +++--- bundles/pubsub/pubsub_admin_tcp/v1/CMakeLists.txt | 20 ++++++++++---------- .../pubsub/pubsub_admin_websocket/v1/CMakeLists.txt | 18 +++++++++--------- bundles/pubsub/pubsub_admin_zmq/v1/CMakeLists.txt | 18 +++++++++--------- cmake/CelixConfig.cmake | 11 ----------- 5 files changed, 31 insertions(+), 42 deletions(-) diff --git a/bundles/pubsub/CMakeLists.txt b/bundles/pubsub/CMakeLists.txt index 01d2140..39c04b2 100644 --- a/bundles/pubsub/CMakeLists.txt +++ b/bundles/pubsub/CMakeLists.txt @@ -23,14 +23,14 @@ if (PUBSUB) option(BUILD_ZMQ_SECURITY "Build with security for ZeroMQ." OFF) add_subdirectory(pubsub_admin_zmq/v1) add_subdirectory(pubsub_admin_zmq/v2) - add_library(Celix::celix_pubsub_admin_zmq ALIAS celix_pubsub_admin_zmq_v1) + add_library(Celix::celix_pubsub_admin_zmq ALIAS celix_pubsub_admin_zmq) endif (BUILD_PUBSUB_PSA_ZMQ) option(BUILD_PUBSUB_PSA_TCP "Build TCP PubSub Admin" ON) if (BUILD_PUBSUB_PSA_TCP) add_subdirectory(pubsub_admin_tcp/v1) add_subdirectory(pubsub_admin_tcp/v2) - add_library(Celix::celix_pubsub_admin_tcp ALIAS celix_pubsub_admin_tcp_v1) + add_library(Celix::celix_pubsub_admin_tcp ALIAS celix_pubsub_admin_tcp) endif (BUILD_PUBSUB_PSA_TCP) option(BUILD_PUBSUB_PSA_UDP_MC "Build UDP MC PubSub Admin" ON) @@ -42,7 +42,7 @@ if (PUBSUB) if (BUILD_PUBSUB_PSA_WS) add_subdirectory(pubsub_admin_websocket/v1) add_subdirectory(pubsub_admin_websocket/v2) - add_library(Celix::celix_pubsub_admin_websocket ALIAS celix_pubsub_admin_websocket_v1) + add_library(Celix::celix_pubsub_admin_websocket ALIAS celix_pubsub_admin_websocket) endif (BUILD_PUBSUB_PSA_WS) add_subdirectory(pubsub_api) diff --git a/bundles/pubsub/pubsub_admin_tcp/v1/CMakeLists.txt b/bundles/pubsub/pubsub_admin_tcp/v1/CMakeLists.txt index 8039b77..9a181eb 100644 --- a/bundles/pubsub/pubsub_admin_tcp/v1/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_tcp/v1/CMakeLists.txt @@ -19,8 +19,8 @@ message(STATUS "PubSub TCP Admin V1 is deprecated, and will eventually be replac find_package(UUID REQUIRED) -add_celix_bundle(celix_pubsub_admin_tcp_v1 - BUNDLE_SYMBOLICNAME "apache_celix_pubsub_admin_tcp_v1" +add_celix_bundle(celix_pubsub_admin_tcp + BUNDLE_SYMBOLICNAME "apache_celix_pubsub_admin_tcp" VERSION "1.0.0" GROUP "Celix/PubSub" SOURCES @@ -32,15 +32,15 @@ add_celix_bundle(celix_pubsub_admin_tcp_v1 src/pubsub_tcp_common.c ) -set_target_properties(celix_pubsub_admin_tcp_v1 PROPERTIES INSTALL_RPATH "$ORIGIN") -target_link_libraries(celix_pubsub_admin_tcp_v1 PRIVATE Celix::pubsub_spi Celix::pubsub_utils) -target_link_libraries(celix_pubsub_admin_tcp_v1 PRIVATE Celix::framework Celix::dfi Celix::log_helper) -target_include_directories(celix_pubsub_admin_tcp_v1 PRIVATE src) +set_target_properties(celix_pubsub_admin_tcp PROPERTIES INSTALL_RPATH "$ORIGIN") +target_link_libraries(celix_pubsub_admin_tcp PRIVATE Celix::pubsub_spi Celix::pubsub_utils) +target_link_libraries(celix_pubsub_admin_tcp PRIVATE Celix::framework Celix::dfi Celix::log_helper) +target_include_directories(celix_pubsub_admin_tcp PRIVATE src) # cmake find package UUID set the wrong include dir for OSX if (NOT APPLE) - target_link_libraries(celix_pubsub_admin_tcp_v1 PRIVATE UUID::lib) + target_link_libraries(celix_pubsub_admin_tcp PRIVATE UUID::lib) endif() -install_celix_bundle(celix_pubsub_admin_tcp_v1 EXPORT celix COMPONENT pubsub) -target_link_libraries(celix_pubsub_admin_tcp_v1 PRIVATE Celix::shell_api) -add_library(Celix::celix_pubsub_admin_tcp_v1 ALIAS celix_pubsub_admin_tcp_v1) +install_celix_bundle(celix_pubsub_admin_tcp EXPORT celix COMPONENT pubsub) +target_link_libraries(celix_pubsub_admin_tcp PRIVATE Celix::shell_api) +add_library(Celix::celix_pubsub_admin_tcp ALIAS celix_pubsub_admin_tcp) diff --git a/bundles/pubsub/pubsub_admin_websocket/v1/CMakeLists.txt b/bundles/pubsub/pubsub_admin_websocket/v1/CMakeLists.txt index 4cff18f..a38ac85 100644 --- a/bundles/pubsub/pubsub_admin_websocket/v1/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_websocket/v1/CMakeLists.txt @@ -20,8 +20,8 @@ message(STATUS "PubSub Websocket Admin V1 is deprecated, and will eventually be find_package(Jansson REQUIRED) find_package(UUID REQUIRED) -add_celix_bundle(celix_pubsub_admin_websocket_v1 - BUNDLE_SYMBOLICNAME "apache_celix_pubsub_admin_websocket_v1" +add_celix_bundle(celix_pubsub_admin_websocket + BUNDLE_SYMBOLICNAME "apache_celix_pubsub_admin_websocket" VERSION "1.0.0" GROUP "Celix/PubSub" SOURCES @@ -32,16 +32,16 @@ add_celix_bundle(celix_pubsub_admin_websocket_v1 src/pubsub_websocket_common.c ) -set_target_properties(celix_pubsub_admin_websocket_v1 PROPERTIES INSTALL_RPATH "$ORIGIN") -target_link_libraries(celix_pubsub_admin_websocket_v1 PRIVATE +set_target_properties(celix_pubsub_admin_websocket PROPERTIES INSTALL_RPATH "$ORIGIN") +target_link_libraries(celix_pubsub_admin_websocket PRIVATE Celix::framework Celix::dfi Celix::log_helper Celix::utils Celix::http_admin_api ) -target_link_libraries(celix_pubsub_admin_websocket_v1 PRIVATE Celix::pubsub_spi Celix::pubsub_utils ) -target_include_directories(celix_pubsub_admin_websocket_v1 PRIVATE +target_link_libraries(celix_pubsub_admin_websocket PRIVATE Celix::pubsub_spi Celix::pubsub_utils ) +target_include_directories(celix_pubsub_admin_websocket PRIVATE src ) -install_celix_bundle(celix_pubsub_admin_websocket_v1 EXPORT celix COMPONENT pubsub) -target_link_libraries(celix_pubsub_admin_websocket_v1 PRIVATE Celix::shell_api) -add_library(Celix::celix_pubsub_admin_websocket_v1 ALIAS celix_pubsub_admin_websocket_v1) +install_celix_bundle(celix_pubsub_admin_websocket EXPORT celix COMPONENT pubsub) +target_link_libraries(celix_pubsub_admin_websocket PRIVATE Celix::shell_api) +add_library(Celix::celix_pubsub_admin_websocket ALIAS celix_pubsub_admin_websocket) diff --git a/bundles/pubsub/pubsub_admin_zmq/v1/CMakeLists.txt b/bundles/pubsub/pubsub_admin_zmq/v1/CMakeLists.txt index 37ea629..2427425 100644 --- a/bundles/pubsub/pubsub_admin_zmq/v1/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_zmq/v1/CMakeLists.txt @@ -33,8 +33,8 @@ if (BUILD_ZMQ_SECURITY) set (ZMQ_CRYPTO_C "src/zmq_crypto.c") endif() -add_celix_bundle(celix_pubsub_admin_zmq_v1 - BUNDLE_SYMBOLICNAME "apache_celix_pubsub_admin_zmq_v1" +add_celix_bundle(celix_pubsub_admin_zmq + BUNDLE_SYMBOLICNAME "apache_celix_pubsub_admin_zmq" VERSION "1.1.0" GROUP "Celix/PubSub" SOURCES @@ -45,17 +45,17 @@ add_celix_bundle(celix_pubsub_admin_zmq_v1 ${ZMQ_CRYPTO_C} ) -set_target_properties(celix_pubsub_admin_zmq_v1 PROPERTIES INSTALL_RPATH "$ORIGIN") -target_link_libraries(celix_pubsub_admin_zmq_v1 PRIVATE +set_target_properties(celix_pubsub_admin_zmq PROPERTIES INSTALL_RPATH "$ORIGIN") +target_link_libraries(celix_pubsub_admin_zmq PRIVATE Celix::framework Celix::dfi Celix::log_helper Celix::utils ZMQ::lib CZMQ::lib ${OPTIONAL_OPENSSL_LIB} ) -target_link_libraries(celix_pubsub_admin_zmq_v1 PRIVATE Celix::pubsub_spi Celix::pubsub_utils ) -target_include_directories(celix_pubsub_admin_zmq_v1 PRIVATE +target_link_libraries(celix_pubsub_admin_zmq PRIVATE Celix::pubsub_spi Celix::pubsub_utils ) +target_include_directories(celix_pubsub_admin_zmq PRIVATE src ) -install_celix_bundle(celix_pubsub_admin_zmq_v1 EXPORT celix COMPONENT pubsub) -target_link_libraries(celix_pubsub_admin_zmq_v1 PRIVATE Celix::shell_api) -add_library(Celix::celix_pubsub_admin_zmq_v1 ALIAS celix_pubsub_admin_zmq_v1) +install_celix_bundle(celix_pubsub_admin_zmq EXPORT celix COMPONENT pubsub) +target_link_libraries(celix_pubsub_admin_zmq PRIVATE Celix::shell_api) +add_library(Celix::celix_pubsub_admin_zmq ALIAS celix_pubsub_admin_zmq) diff --git a/cmake/CelixConfig.cmake b/cmake/CelixConfig.cmake index a7e9f04..6c7acb4 100644 --- a/cmake/CelixConfig.cmake +++ b/cmake/CelixConfig.cmake @@ -68,17 +68,6 @@ if (TARGET Celix::dependency_manager_cxx) set(CELIX_DM_CXX_STATIC_LIB $<TARGET_PROPERTY:Celix::dependency_manager_cxx,INTERFACE_INCLUDE_DIRECTORIES>) endif () -#Setting up pubsub admin alias to the v1 version. -if (TARGET Celix::celix_pubsub_admin_zmq_v1) - add_library(Celix::celix_pubsub_admin_zmq ALIAS Celix::celix_pubsub_admin_zmq_v1) -endif () -if (TARGET Celix::celix_pubsub_admin_tcp_v1) - add_library(Celix::celix_pubsub_admin_tcp ALIAS Celix::celix_pubsub_admin_tcp_v1) -endif () -if (TARGET Celix::celix_pubsub_admin_websocket_v1) - add_library(Celix::celix_pubsub_admin_websocket ALIAS Celix::celix_pubsub_admin_websocket_v1) -endif () - set(CELIX_BUNDLES_DIR ${REL_INSTALL_DIR}/share/celix/bundles) set(CELIX_SHELL_BUNDLE ${CELIX_BUNDLES_DIR}/shell.zip) set(CELIX_SHELL_TUI_BUNDLE ${CELIX_BUNDLES_DIR}/shell_tui.zip)
