diff --git a/CMakeLists.txt b/CMakeLists.txt index b2e06ce3..f141b694 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ # copied verbatim in the file "LICENSE" # ################################################################################ -cmake_minimum_required(VERSION 3.11 FATAL_ERROR) -cmake_policy(VERSION 3.11...3.15) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) +cmake_policy(VERSION 3.12...3.15) # Project ###################################################################### set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index bea43f14..ef095471 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -4,6 +4,7 @@ Eulisse, Giulio Karabowicz, Radoslaw Kretz, Matthias Krzewicki, Mikolaj +Lebedev, Andrey Mrnjavac, Teo Neskovic, Gvozden Richter, Matthias diff --git a/examples/dds/CMakeLists.txt b/examples/dds/CMakeLists.txt index 55de9157..8a3c8f69 100644 --- a/examples/dds/CMakeLists.txt +++ b/examples/dds/CMakeLists.txt @@ -28,6 +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) +list(JOIN Boost_LIBRARY_DIRS ":" LIB_DIR) 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) diff --git a/examples/dds/fairmq-ex-dds-env.sh b/examples/dds/fairmq-ex-dds-env.sh index 719f837d..6f2e45c5 100755 --- a/examples/dds/fairmq-ex-dds-env.sh +++ b/examples/dds/fairmq-ex-dds-env.sh @@ -9,3 +9,8 @@ ################################################################################ export PATH=@BIN_DIR@:$PATH + +OS=$(uname -s 2>&1) +if [ "$OS" == "Darwin" ]; then + export DYLD_LIBRARY_PATH=@LIB_DIR@:$DYLD_LIBRARY_PATH +fi