diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63404bae..8fa13e09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,10 @@ if(BUILD_NANOMSG_TRANSPORT)
)
endif()
+if(BUILD_DDS_PLUGIN)
+ set(DDS_Boost_COMPONENTS system log log_setup)
+endif()
+
if(BUILD_FAIRMQ)
find_package2(PUBLIC Boost REQUIRED
VERSION 1.64 ${asiofi_Boost_VERSION}
@@ -85,6 +89,7 @@ if(BUILD_FAIRMQ)
date_time
regex
${asiofi_Boost_COMPONENTS}
+ ${DDS_Boost_COMPONENTS}
)
find_package2(PUBLIC FairLogger REQUIRED
VERSION 1.2.0
@@ -95,7 +100,7 @@ if(BUILD_FAIRMQ)
endif()
if(BUILD_DDS_PLUGIN)
- find_package2(PRIVATE DDS VERSION 2.2 REQUIRED)
+ find_package2(PRIVATE DDS VERSION 2.4 REQUIRED)
endif()
if(BUILD_PMIX_PLUGIN)
@@ -186,11 +191,6 @@ if(BUILD_FAIRMQ)
DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
)
endif()
-if(BUILD_DDS_PLUGIN)
- install(FILES cmake/FindDDS.cmake
- DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR}
- )
-endif()
if(BUILD_DOCS)
install(DIRECTORY ${CMAKE_BINARY_DIR}/doxygen/html
DESTINATION ${PROJECT_INSTALL_DATADIR}/docs
diff --git a/cmake/FindDDS.cmake b/cmake/FindDDS.cmake
deleted file mode 100644
index eaaa2e97..00000000
--- a/cmake/FindDDS.cmake
+++ /dev/null
@@ -1,88 +0,0 @@
-################################################################################
-# Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH #
-# #
-# This software is distributed under the terms of the #
-# GNU Lesser General Public Licence (LGPL) version 3, #
-# copied verbatim in the file "LICENSE" #
-################################################################################
-
-find_path(DDS_INCLUDE_DIR
- NAMES dds_intercom.h
- HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
- PATH_SUFFIXES include
-)
-
-find_path(DDS_LIBRARY_DIR
- NAMES libdds_intercom_lib.dylib libdds_intercom_lib.so
- HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
- PATH_SUFFIXES lib
-)
-
-find_library(DDS_INTERCOM_LIBRARY_SHARED
- NAMES libdds_intercom_lib.dylib libdds_intercom_lib.so
- HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
- PATH_SUFFIXES lib
- DOC "Path to libdds_intercom_lib.dylib libdds_intercom_lib.so."
-)
-
-find_library(DDS_PROTOCOL_LIBRARY_SHARED
- NAMES libdds_protocol_lib.dylib libdds_protocol_lib.so
- HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
- PATH_SUFFIXES lib
- DOC "Path to libdds_protocol_lib.dylib libdds_protocol_lib.so."
-)
-
-find_library(DDS_USER_DEFAULTS_LIBRARY_SHARED
- NAMES libdds-user-defaults.dylib libdds-user-defaults.so
- HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
- PATH_SUFFIXES lib
- DOC "Path to libdds-user-defaults.dylib libdds-user-defaults.so."
-)
-
-find_file(DDS_VERSION_FILE
- NAMES version
- HINTS ${DDS_ROOT} $ENV{DDS_ROOT}
- PATH_SUFFIXES etc
-)
-
-if(DDS_VERSION_FILE AND NOT DDS_VERSION)
- file(READ ${DDS_VERSION_FILE} DDS_VERSION)
- string(STRIP "${DDS_VERSION}" DDS_VERSION)
- set(DDS_VERSION ${DDS_VERSION} CACHE string "DDS version.")
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(DDS
- REQUIRED_VARS
- DDS_INCLUDE_DIR
- DDS_LIBRARY_DIR
- DDS_INTERCOM_LIBRARY_SHARED
- DDS_PROTOCOL_LIBRARY_SHARED
- DDS_USER_DEFAULTS_LIBRARY_SHARED
-
- VERSION_VAR DDS_VERSION
-)
-
-if(NOT TARGET DDS::dds_intercom_lib AND DDS_FOUND)
- add_library(DDS::dds_intercom_lib SHARED IMPORTED)
- set_target_properties(DDS::dds_intercom_lib PROPERTIES
- IMPORTED_LOCATION ${DDS_INTERCOM_LIBRARY_SHARED}
- INTERFACE_INCLUDE_DIRECTORIES ${DDS_INCLUDE_DIR}
- )
-endif()
-
-if(NOT TARGET DDS::dds_protocol_lib AND DDS_FOUND)
- add_library(DDS::dds_protocol_lib SHARED IMPORTED)
- set_target_properties(DDS::dds_protocol_lib PROPERTIES
- IMPORTED_LOCATION ${DDS_PROTOCOL_LIBRARY_SHARED}
- INTERFACE_INCLUDE_DIRECTORIES ${DDS_INCLUDE_DIR}
- )
-endif()
-
-if(NOT TARGET DDS::dds-user-defaults AND DDS_FOUND)
- add_library(DDS::dds-user-defaults SHARED IMPORTED)
- set_target_properties(DDS::dds-user-defaults PROPERTIES
- IMPORTED_LOCATION ${DDS_USER_DEFAULTS_LIBRARY_SHARED}
- INTERFACE_INCLUDE_DIRECTORIES ${DDS_INCLUDE_DIR}
- )
-endif()
diff --git a/examples/dds/README.md b/examples/dds/README.md
index 286c73e6..c8213f13 100644
--- a/examples/dds/README.md
+++ b/examples/dds/README.md
@@ -40,9 +40,9 @@ The configuration of the channel connection addresses is done by the DDS plugin
**If you chose step 2b earlier**, then modify the provided `ex-dds-topology.xml` in the top that the following lines read as following:
```xml
-
-
-
+
+
+
```
Note that the attributes `value` contain a different value.
diff --git a/examples/dds/ex-dds-topology.xml b/examples/dds/ex-dds-topology.xml
index a0ffff88..851dd28e 100644
--- a/examples/dds/ex-dds-topology.xml
+++ b/examples/dds/ex-dds-topology.xml
@@ -1,47 +1,47 @@
-
+
-
-
+
+
-
-
-
+
+
+
-
+
@EX_BIN_DIR@/fairmq-ex-dds-sampler --id sampler --color false --channel-config name=data1,type=push,method=bind -S "<@DDS_PLUGIN_LIB_DIR@/" -P dds
- SamplerWorker
+ SamplerWorker
- data1
+ data1
-
+
@EX_BIN_DIR@/fairmq-ex-dds-processor --id processor_%taskIndex% --config-key processor --color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -S "<@DDS_PLUGIN_LIB_DIR@/" -P dds
- ProcessorWorker
+ ProcessorWorker
- data1
- data2
+ data1
+ data2
-
+
@EX_BIN_DIR@/fairmq-ex-dds-sink --id sink --color false --channel-config name=data2,type=pull,method=bind -S "<@DDS_PLUGIN_LIB_DIR@/" -P dds
- SinkWorker
+ SinkWorker
- data2
+ data2
-
+
Sampler
Sink
-
+
Processor
diff --git a/fairmq/plugins/DDS/DDS.h b/fairmq/plugins/DDS/DDS.h
index 2ef265fd..0da13d12 100644
--- a/fairmq/plugins/DDS/DDS.h
+++ b/fairmq/plugins/DDS/DDS.h
@@ -11,7 +11,7 @@
#include
-#include
+#include
#include
#include
diff --git a/fairmq/plugins/DDS/runDDSCommandUI.cxx b/fairmq/plugins/DDS/runDDSCommandUI.cxx
index 940d05e2..09116a14 100644
--- a/fairmq/plugins/DDS/runDDSCommandUI.cxx
+++ b/fairmq/plugins/DDS/runDDSCommandUI.cxx
@@ -6,7 +6,7 @@
* copied verbatim in the file "LICENSE" *
********************************************************************************/
-#include
+#include
#include // raw mode console input