From 2ac27905e717fd3b6996940182e9c5ab5af8f05a Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Thu, 3 Sep 2020 12:04:04 +0200 Subject: [PATCH] Move fairmq-dds-command-ui to SDK --- CMakeLists.txt | 44 +++++++++---------- examples/dds/CMakeLists.txt | 2 +- examples/n-m/CMakeLists.txt | 2 +- examples/qc/CMakeLists.txt | 2 +- fairmq/plugins/DDS/CMakeLists.txt | 8 +--- fairmq/sdk/CMakeLists.txt | 9 ++++ .../{plugins/DDS => sdk}/runDDSCommandUI.cxx | 0 7 files changed, 35 insertions(+), 32 deletions(-) rename fairmq/{plugins/DDS => sdk}/runDDSCommandUI.cxx (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index cab9cafe..e2edb0e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,28 +31,28 @@ include(CTest) # Build options ################################################################ -fairmq_build_option(BUILD_FAIRMQ "Build FairMQ library and devices." - DEFAULT ON) -fairmq_build_option(BUILD_TESTING "Build tests." - DEFAULT OFF REQUIRES "BUILD_FAIRMQ") -fairmq_build_option(BUILD_OFI_TRANSPORT "Build experimental OFI transport." - DEFAULT OFF REQUIRES "BUILD_FAIRMQ") -fairmq_build_option(BUILD_SDK_COMMANDS "Build the FairMQ SDK commands." - DEFAULT OFF) -fairmq_build_option(BUILD_DDS_PLUGIN "Build DDS plugin." - DEFAULT OFF REQUIRES "BUILD_FAIRMQ;BUILD_SDK_COMMANDS") -fairmq_build_option(BUILD_PMIX_PLUGIN "Build PMIx plugin." - DEFAULT OFF REQUIRES "BUILD_FAIRMQ;BUILD_SDK_COMMANDS") -fairmq_build_option(BUILD_EXAMPLES "Build FairMQ examples." - DEFAULT ON REQUIRES "BUILD_FAIRMQ") -fairmq_build_option(BUILD_SDK "Build the FairMQ controller SDK." - DEFAULT OFF REQUIRES "BUILD_DDS_PLUGIN;BUILD_SDK_COMMANDS") -fairmq_build_option(BUILD_DOCS "Build FairMQ documentation." - DEFAULT OFF) -fairmq_build_option(FAST_BUILD "Fast production build. Not recommended for development." - DEFAULT OFF) -fairmq_build_option(USE_EXTERNAL_GTEST "Do not use bundled GTest. Not recommended." - DEFAULT OFF) +fairmq_build_option(BUILD_FAIRMQ "Build FairMQ library and devices." + DEFAULT ON) +fairmq_build_option(BUILD_TESTING "Build tests." + DEFAULT OFF REQUIRES "BUILD_FAIRMQ") +fairmq_build_option(BUILD_OFI_TRANSPORT "Build experimental OFI transport." + DEFAULT OFF REQUIRES "BUILD_FAIRMQ") +fairmq_build_option(BUILD_SDK_COMMANDS "Build the FairMQ SDK commands." + DEFAULT OFF) +fairmq_build_option(BUILD_DDS_PLUGIN "Build DDS plugin." + DEFAULT OFF REQUIRES "BUILD_FAIRMQ;BUILD_SDK_COMMANDS") +fairmq_build_option(BUILD_PMIX_PLUGIN "Build PMIx plugin." + DEFAULT OFF REQUIRES "BUILD_FAIRMQ;BUILD_SDK_COMMANDS") +fairmq_build_option(BUILD_EXAMPLES "Build FairMQ examples." + DEFAULT ON REQUIRES "BUILD_FAIRMQ") +fairmq_build_option(BUILD_SDK "Build the FairMQ controller SDK." + DEFAULT OFF REQUIRES "BUILD_DDS_PLUGIN;BUILD_SDK_COMMANDS") +fairmq_build_option(BUILD_DOCS "Build FairMQ documentation." + DEFAULT OFF) +fairmq_build_option(FAST_BUILD "Fast production build. Not recommended for development." + DEFAULT OFF) +fairmq_build_option(USE_EXTERNAL_GTEST "Do not use bundled GTest. Not recommended." + DEFAULT OFF) ################################################################################ diff --git a/examples/dds/CMakeLists.txt b/examples/dds/CMakeLists.txt index a8b357cc..4b40e0c2 100644 --- a/examples/dds/CMakeLists.txt +++ b/examples/dds/CMakeLists.txt @@ -29,7 +29,7 @@ target_link_libraries(fairmq-ex-dds-sink PRIVATE ExampleDDSLib) add_custom_target(ExampleDDS DEPENDS fairmq-ex-dds-sampler fairmq-ex-dds-processor fairmq-ex-dds-sink) list(JOIN Boost_LIBRARY_DIRS ":" LIB_DIR) -set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/plugins/DDS) +set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/sdk) set(DATA_DIR ${CMAKE_CURRENT_BINARY_DIR}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology-infinite.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology-infinite.xml @ONLY) diff --git a/examples/n-m/CMakeLists.txt b/examples/n-m/CMakeLists.txt index eb2970cd..ea7ba202 100644 --- a/examples/n-m/CMakeLists.txt +++ b/examples/n-m/CMakeLists.txt @@ -18,7 +18,7 @@ target_link_libraries(fairmq-ex-n-m-receiver PRIVATE FairMQ) add_custom_target(ExampleNM DEPENDS fairmq-ex-n-m-synchronizer fairmq-ex-n-m-sender fairmq-ex-n-m-receiver) list(JOIN Boost_LIBRARY_DIRS ":" LIB_DIR) -set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/plugins/DDS) +set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/sdk) set(DATA_DIR ${CMAKE_CURRENT_BINARY_DIR}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-n-m-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-n-m-topology.xml @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-n-m-pair-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-n-m-pair-topology.xml @ONLY) diff --git a/examples/qc/CMakeLists.txt b/examples/qc/CMakeLists.txt index ba01160e..5167836b 100644 --- a/examples/qc/CMakeLists.txt +++ b/examples/qc/CMakeLists.txt @@ -21,7 +21,7 @@ target_link_libraries(fairmq-ex-qc-sink PRIVATE FairMQ) add_custom_target(ExampleQC DEPENDS fairmq-ex-qc-sampler fairmq-ex-qc-dispatcher fairmq-ex-qc-task fairmq-ex-qc-sink) list(JOIN Boost_LIBRARY_DIRS ":" LIB_DIR) -set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/plugins/DDS) +set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/sdk) set(DATA_DIR ${CMAKE_CURRENT_BINARY_DIR}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-qc-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-qc-topology.xml @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-ex-qc-env.sh ${CMAKE_CURRENT_BINARY_DIR}/fairmq-ex-qc-env.sh @ONLY) diff --git a/fairmq/plugins/DDS/CMakeLists.txt b/fairmq/plugins/DDS/CMakeLists.txt index 1a448633..6475e7b1 100644 --- a/fairmq/plugins/DDS/CMakeLists.txt +++ b/fairmq/plugins/DDS/CMakeLists.txt @@ -17,13 +17,7 @@ set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/fairmq ) -set(exe fairmq-dds-command-ui) -add_executable(${exe} ${CMAKE_CURRENT_SOURCE_DIR}/runDDSCommandUI.cxx) -target_link_libraries(${exe} FairMQ Commands SDK StateMachine) -target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - -install(TARGETS ${plugin} ${exe} +install(TARGETS ${plugin} EXPORT ${PROJECT_EXPORT_SET} LIBRARY DESTINATION ${PROJECT_INSTALL_LIBDIR} - RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} ) diff --git a/fairmq/sdk/CMakeLists.txt b/fairmq/sdk/CMakeLists.txt index 5489d5b7..97393bf4 100644 --- a/fairmq/sdk/CMakeLists.txt +++ b/fairmq/sdk/CMakeLists.txt @@ -84,10 +84,19 @@ target_link_libraries(fairmq Boost::program_options ) +add_executable(fairmq-dds-command-ui ${CMAKE_CURRENT_SOURCE_DIR}/runDDSCommandUI.cxx) +target_link_libraries(fairmq-dds-command-ui + FairMQ + Commands + SDK + StateMachine +) + install( TARGETS SDK fairmq + fairmq-dds-command-ui EXPORT ${PROJECT_EXPORT_SET} RUNTIME DESTINATION ${PROJECT_INSTALL_BINDIR} diff --git a/fairmq/plugins/DDS/runDDSCommandUI.cxx b/fairmq/sdk/runDDSCommandUI.cxx similarity index 100% rename from fairmq/plugins/DDS/runDDSCommandUI.cxx rename to fairmq/sdk/runDDSCommandUI.cxx