Skip to content
Snippets Groups Projects
Commit 14cb0959 authored by Jan de Cuveland's avatar Jan de Cuveland
Browse files

Fix build flow for updated flesnet

parent 47739691
No related branches found
No related tags found
1 merge request!1856Update flesnet version
Pipeline #29867 failed
...@@ -73,6 +73,7 @@ set_target_properties(external::zmq PROPERTIES ...@@ -73,6 +73,7 @@ set_target_properties(external::zmq PROPERTIES
target_include_directories(external::zmq INTERFACE target_include_directories(external::zmq INTERFACE
${FLESNET_DESTDIR}/src/flesnet-build/src/zeromq/include ${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_library(external::fles_logging STATIC IMPORTED GLOBAL)
add_dependencies(external::fles_logging flesnet) add_dependencies(external::fles_logging flesnet)
...@@ -140,18 +141,19 @@ endif() ...@@ -140,18 +141,19 @@ endif()
if(APPLE AND Boost_VERSION LESS 1.80.0) if(APPLE AND Boost_VERSION LESS 1.80.0)
set_target_properties(external::fles_ipc PROPERTIES 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} 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}" IMPORTED_LINK_INTERFACE_LIBRARIES "${dir_to_link}"
INTERFACE_LINK_DIRECTORIES "/usr/local/lib" INTERFACE_LINK_DIRECTORIES "/usr/local/lib"
) )
else () else ()
set_target_properties(external::fles_ipc PROPERTIES 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} 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}" IMPORTED_LINK_INTERFACE_LIBRARIES "${dir_to_link}"
) )
endif() endif()
target_include_directories(external::fles_ipc INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/flesnet/lib/fles_ipc
${CMAKE_CURRENT_SOURCE_DIR}/flesnet/lib/shm_ipc
)
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef CBMMCBM2018MSCRCCHECK_H #ifndef CBMMCBM2018MSCRCCHECK_H
#define CBMMCBM2018MSCRCCHECK_H #define CBMMCBM2018MSCRCCHECK_H
#include "TimesliceSubscriber.hpp" #include "TimesliceSource.hpp"
#include "TList.h" #include "TList.h"
#include "TObjString.h" #include "TObjString.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment