diff --git a/examples/dds/CMakeLists.txt b/examples/dds/CMakeLists.txt index 6641ec69..8d6e96f7 100644 --- a/examples/dds/CMakeLists.txt +++ b/examples/dds/CMakeLists.txt @@ -28,8 +28,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) -set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}) -set(PLUGIN_DIR ${CMAKE_BINARY_DIR}/fairmq/plugins/DDS) +set(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/fairmq/plugins/DDS) 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-hosts.cfg ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-hosts.cfg COPYONLY) @@ -51,7 +50,6 @@ install( # configure run script with different executable paths for build and for install directories set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_BINDIR}) -set(PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}) set(DATA_DIR ${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_DATADIR}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ex-dds-topology.xml ${CMAKE_CURRENT_BINARY_DIR}/ex-dds-topology.xml_install @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fairmq-start-ex-dds.sh.in ${CMAKE_CURRENT_BINARY_DIR}/fairmq-start-ex-dds.sh_install @ONLY) diff --git a/examples/dds/ex-dds-topology.xml b/examples/dds/ex-dds-topology.xml index 2a10cce4..f4436d96 100644 --- a/examples/dds/ex-dds-topology.xml +++ b/examples/dds/ex-dds-topology.xml @@ -7,8 +7,8 @@ - - fairmq-ex-dds-sampler --id sampler --channel-config name=data1,type=push,method=bind -P dds + + fairmq-ex-dds-sampler --id sampler --color false --channel-config name=data1,type=push,method=bind -P dds --iterations 10 SamplerWorker @@ -17,8 +17,8 @@ - - fairmq-ex-dds-processor --id processor_%taskIndex% --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -P dds + + fairmq-ex-dds-processor --id processor_%taskIndex% --color false --channel-config name=data1,type=pull,method=connect name=data2,type=push,method=connect -P dds ProcessorWorker @@ -28,8 +28,8 @@ - - fairmq-ex-dds-sink --id sink --channel-config name=data2,type=pull,method=bind -P dds + + fairmq-ex-dds-sink --id sink --color false --channel-config name=data2,type=pull,method=bind -P dds --iterations 10 SinkWorker diff --git a/examples/dds/fairmq-start-ex-dds.sh.in b/examples/dds/fairmq-start-ex-dds.sh.in index 32c2dac5..df92c453 100755 --- a/examples/dds/fairmq-start-ex-dds.sh.in +++ b/examples/dds/fairmq-start-ex-dds.sh.in @@ -16,7 +16,7 @@ cleanup() { } source @DDS_INSTALL_PREFIX@/DDS_env.sh -export PATH=@BIN_DIR@:@PLUGIN_DIR@:$PATH +export PATH=@BIN_DIR@:$PATH exec 5>&1 output=$(dds-session start | tee >(cat - >&5))