diff --git a/external/InstallFlesnet.cmake b/external/InstallFlesnet.cmake index d4bc21b7b5d8f8a7aec059c0195e2c9b796d5719..3a3674bcd95cc8059e0d920807fb409a2667631d 100644 --- a/external/InstallFlesnet.cmake +++ b/external/InstallFlesnet.cmake @@ -73,6 +73,7 @@ set_target_properties(external::zmq PROPERTIES target_include_directories(external::zmq INTERFACE ${FLESNET_DESTDIR}/src/flesnet-build/src/zeromq/include ) +target_compile_definitions(external::zmq INTERFACE ZMQ_BUILD_DRAFT_API=1) add_library(external::fles_logging STATIC IMPORTED GLOBAL) add_dependencies(external::fles_logging flesnet) @@ -140,18 +141,19 @@ endif() if(APPLE AND Boost_VERSION LESS 1.80.0) set_target_properties(external::fles_ipc PROPERTIES IMPORTED_LOCATION ${FLESNET_DESTDIR}/src/flesnet-build/lib/fles_ipc/${CMAKE_STATIC_LIBRARY_PREFIX}fles_ipc${CMAKE_STATIC_LIBRARY_SUFFIX} - INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/flesnet/lib/fles_ipc IMPORTED_LINK_INTERFACE_LIBRARIES "${dir_to_link}" INTERFACE_LINK_DIRECTORIES "/usr/local/lib" ) else () set_target_properties(external::fles_ipc PROPERTIES IMPORTED_LOCATION ${FLESNET_DESTDIR}/src/flesnet-build/lib/fles_ipc/${CMAKE_STATIC_LIBRARY_PREFIX}fles_ipc${CMAKE_STATIC_LIBRARY_SUFFIX} - INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/flesnet/lib/fles_ipc IMPORTED_LINK_INTERFACE_LIBRARIES "${dir_to_link}" ) endif() - +target_include_directories(external::fles_ipc INTERFACE + ${CMAKE_CURRENT_SOURCE_DIR}/flesnet/lib/fles_ipc + ${CMAKE_CURRENT_SOURCE_DIR}/flesnet/lib/shm_ipc +) diff --git a/fles/mcbm2018/CbmMcbm2018MsCrcCheck.h b/fles/mcbm2018/CbmMcbm2018MsCrcCheck.h index 7da417232fff87135ae3745ec842e5a1608f9caa..5e272d8d7a4211f94aaf56ba3954ac30d3269bc7 100644 --- a/fles/mcbm2018/CbmMcbm2018MsCrcCheck.h +++ b/fles/mcbm2018/CbmMcbm2018MsCrcCheck.h @@ -12,7 +12,7 @@ #ifndef CBMMCBM2018MSCRCCHECK_H #define CBMMCBM2018MSCRCCHECK_H -#include "TimesliceSubscriber.hpp" +#include "TimesliceSource.hpp" #include "TList.h" #include "TObjString.h"