diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index ab6795b23b1ceed1920f98b180607d274751ac61..20d2b6cb5b21445759cf5f2512abaf73858a00d8 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -14,20 +14,12 @@ if(DOWNLOAD_EXTERNALS) TEST_FILE zmq.hpp ) - download_project_if_needed(PROJECT flib_dpb_20 - GIT_REPOSITORY "https://git.cbm.gsi.de/f.uhlig/flib_dpb_20.git" - GIT_TAG "9ce7c7c0ccc7c9ea2f8c396c35d7fe39ac9aafb6" - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/flib_dpb_20 - TEST_FILE CMakeLists.txt - ) Set(IPC_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ipc/ipc/lib/fles_ipc PARENT_SCOPE) Set(IPCLOG_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ipc/ipc/lib/logging PARENT_SCOPE) Add_Subdirectory(ipc) - Add_Subdirectory(ipc_legacy) Add_Subdirectory(flib_dpb) - Add_Subdirectory(flib_dpb_20) Add_Subdirectory(spadic) Include(InstallVC.cmake) diff --git a/external/ipc_legacy/CMakeLists.txt b/external/ipc_legacy/CMakeLists.txt deleted file mode 100644 index 0340da4ee45a578122d96c9f1e216fa88dcfa897..0000000000000000000000000000000000000000 --- a/external/ipc_legacy/CMakeLists.txt +++ /dev/null @@ -1,58 +0,0 @@ -# Build the fles_ipc library which is tacken from -# github as defined in the svn:externals definition -# This library provides the interface to the FLIB board or to files in tca -# format written by the FLIB - -download_project_if_needed(PROJECT fles_ipc_legacy - GIT_REPOSITORY "https://github.com/cbm-fles/fles_ipc" - GIT_TAG "88dc25a4e0301b0ada25d9a22ca2541c1eb3590e" - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ipc - TEST_FILE CMakeLists.txt - ) - -Set(INCLUDE_DIRECTORIES - ${CBMROOT_SOURCE_DIR}/external/ipc_legacy/ipc/src -) - -Set(SYSTEM_INCLUDE_DIRECTORIES - ${Boost_INCLUDE_DIR} - ${ZMQ_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/external/cppzmq -) - -Include_Directories( ${INCLUDE_DIRECTORIES}) - -Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) - - -Set(LINK_DIRECTORIES - ${Boost_LIBRARY_DIRS} - ${ZMQ_LIBRARY_DIRS} -) - -Link_Directories( ${LINK_DIRECTORIES}) - -Set(SRCS -ipc/src/Microslice.cpp -ipc/src/MicrosliceView.cpp -ipc/src/StorableMicroslice.cpp -ipc/src/StorableTimeslice.cpp -ipc/src/System.cpp -ipc/src/Timeslice.cpp -ipc/src/TimeslicePublisher.cpp -ipc/src/TimesliceReceiver.cpp -ipc/src/TimesliceSubscriber.cpp -ipc/src/TimesliceView.cpp -) - -Set_Source_Files_Properties(${SRCS} COMPILE_FLAGS "-Wall -pedantic -Wextra -Winit-self -Wundef -Wold-style-cast -Woverloaded-virtual -Wwrite-strings -Wnon-virtual-dtor") - -Set(LIBRARY_NAME fles_ipc_legacy) -If(UNIX AND NOT APPLE) - Set(DEPENDENCIES boost_thread boost_system boost_serialization zmq rt) -Else() - Set(DEPENDENCIES boost_thread boost_system boost_serialization zmq) -EndIf() - - -GENERATE_LIBRARY()