diff --git a/CMakeLists.txt b/CMakeLists.txt index f65eaf1c61de0f4a80418ed13ff8c21c6c08e169..9f450c880316d42cc974484c257d85cecd07c3c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,7 +137,7 @@ endif() #Searching for Boost Package -find_package(Boost COMPONENTS serialization regex filesystem log log_setup container program_options thread) +find_package(Boost COMPONENTS serialization regex filesystem log log_setup container program_options thread iostreams system) if(Boost_FOUND) list(APPEND packages Boost) endif() diff --git a/external/InstallFlesnet.cmake b/external/InstallFlesnet.cmake index 18ae59510060aea177c818acb6643dace07e8a8a..44f3813e331c7ebff52536bf72b7e1c3d90f7f08 100644 --- a/external/InstallFlesnet.cmake +++ b/external/InstallFlesnet.cmake @@ -131,19 +131,30 @@ list(APPEND dir_to_link ${Boost_FILESYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} - ${Boost_ASIO_LIBRARY} - ${Boost_BEAST_LIBRARY} + ${Boost_SYSTEM_LIBRARY} # Needed for the monitoring library linking + ${Boost_IOSTREAMS_LIBRARY} # needed for the fles_ipc library linking fmt::fmt ) if(NOT APPLE) list(APPEND dir_to_link ${Boost_THREAD_LIBRARY} -lrt) endif() -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}" -) +# Hack such that for boost versions below 1.80.0 libzstd is found +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() +