From 3a6254162288d0b65a3e1cca23ba744ca2463a35 Mon Sep 17 00:00:00 2001
From: Jan de Cuveland <cuveland@compeng.uni-frankfurt.de>
Date: Tue, 12 Apr 2022 11:50:34 +0200
Subject: [PATCH] Rename a few flesnet-related build variables for consistency
- fles_ipc -> external::fles_ipc
- fles_logging -> external::fles_logging
- IPC_INCLUDE_DIRECTORY -> FLES_IPC_INCLUDE_DIRECTORY
---
MQ/eTOF/CMakeLists.txt | 5 +++--
MQ/histoServer/CMakeLists.txt | 2 +-
MQ/hitbuilder/CMakeLists.txt | 2 +-
MQ/mcbm/CMakeLists.txt | 17 ++++++++++-------
MQ/monitor/CMakeLists.txt | 12 ++++++------
MQ/sink/CMakeLists.txt | 6 +++---
MQ/source/CMakeLists.txt | 16 ++++++++--------
MQ/unpacker/CMakeLists.txt | 4 ++--
algo/CMakeLists.txt | 2 +-
algo/data/CMakeLists.txt | 2 +-
algo/test/CMakeLists.txt | 2 +-
core/data/CMakeLists.txt | 2 +-
core/data/test/CMakeLists.txt | 2 +-
core/data/test/global/CMakeLists.txt | 2 +-
fles/cosy2019/CMakeLists.txt | 4 ++--
fles/flestools/CMakeLists.txt | 4 ++--
fles/mcbm2018/CMakeLists.txt | 4 ++--
fles/star2019/CMakeLists.txt | 4 ++--
reco/app/cbmreco_fairrun/CMakeLists.txt | 2 +-
reco/base/CMakeLists.txt | 4 ++--
reco/detectors/psd/CMakeLists.txt | 2 +-
reco/detectors/rich/CMakeLists.txt | 2 +-
reco/detectors/sts/CMakeLists.txt | 2 +-
reco/detectors/tof/CMakeLists.txt | 2 +-
reco/detectors/trd/CMakeLists.txt | 2 +-
reco/steer/CMakeLists.txt | 4 ++--
reco/tasks/CMakeLists.txt | 4 ++--
27 files changed, 60 insertions(+), 56 deletions(-)
diff --git a/MQ/eTOF/CMakeLists.txt b/MQ/eTOF/CMakeLists.txt
index fea133da8a..ccfdd8aa16 100644
--- a/MQ/eTOF/CMakeLists.txt
+++ b/MQ/eTOF/CMakeLists.txt
@@ -26,7 +26,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${FAIRMQ_INCLUDE_DIR}
${FAIRMQ_INCLUDE_DIR}/options
- ${IPC_INCLUDE_DIRECTORY}
+ ${FLES_IPC_INCLUDE_DIRECTORY}
${CBMROOT_SOURCE_DIR}/external/cppzmq
)
@@ -77,7 +77,7 @@ set(EXE_NAME EventBuilderEtofStar2019)
set(SRCS CbmDeviceEventBuilderEtofStar2019.cxx runEventBuilderEtofStar2019.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmFlibStar2019
CbmFlibMcbm2018
CbmBase
@@ -101,6 +101,7 @@ SET_SOURCE_FILES_PROPERTIES(${CBMROOT_SOURCE_DIR}/fles/star2017/unpacker/star_rh
set(DEPENDENCIES
${DEPENDENCIES_ALL}
fles_ipc
+ external::fles_ipc
CbmFlibStar2019
CbmFlibMcbm2018
CbmBase
diff --git a/MQ/histoServer/CMakeLists.txt b/MQ/histoServer/CMakeLists.txt
index e9f6ef1da7..70ef6e3693 100644
--- a/MQ/histoServer/CMakeLists.txt
+++ b/MQ/histoServer/CMakeLists.txt
@@ -67,7 +67,7 @@ set(EXE_NAME HistoServer)
set(SRCS CbmHistoServer.cxx runCbmHistoServer.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
Core
RIO
Net
diff --git a/MQ/hitbuilder/CMakeLists.txt b/MQ/hitbuilder/CMakeLists.txt
index 0f7db3120d..79387621ad 100644
--- a/MQ/hitbuilder/CMakeLists.txt
+++ b/MQ/hitbuilder/CMakeLists.txt
@@ -21,7 +21,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${FAIRMQ_INCLUDE_DIR}/options
${VMC_INCLUDE_DIRS}
- ${IPC_INCLUDE_DIRECTORY}
+ ${FLES_IPC_INCLUDE_DIRECTORY}
${CBMROOT_SOURCE_DIR}/external/cppzmq
${CBMROOT_SOURCE_DIR}/reco/detectors/tof
)
diff --git a/MQ/mcbm/CMakeLists.txt b/MQ/mcbm/CMakeLists.txt
index 8e6c685d9e..dc55f355d0 100644
--- a/MQ/mcbm/CMakeLists.txt
+++ b/MQ/mcbm/CMakeLists.txt
@@ -60,7 +60,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${VMC_INCLUDE_DIRS}
${FAIRLOGGER_INCLUDE_DIR}
- ${IPC_INCLUDE_DIRECTORY}
+ ${FLES_IPC_INCLUDE_DIRECTORY}
${CBMROOT_SOURCE_DIR}/external/cppzmq
)
@@ -116,6 +116,7 @@ set(SRCS CbmDeviceMcbmUnpack.cxx runMcbmUnpack.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
fles_ipc
+ external::fles_ipc
CbmFlibMcbm2018
CbmFlibFlesTools
CbmBase
@@ -134,6 +135,7 @@ set(SRCS CbmDeviceMcbmMonitorPulser.cxx runMcbmMonitorPulser.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
fles_ipc
+ external::fles_ipc
CbmFlibMcbm2018
CbmFlibFlesTools
CbmBase
@@ -151,7 +153,7 @@ set(SRCS CbmDeviceBuildRawEvents.cxx runBuildRawEvents.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
KFParticle
CbmFlibMcbm2018
CbmFlibFlesTools
@@ -176,7 +178,7 @@ set(SRCS CbmDeviceMcbmEventBuilderWin.cxx runMcbmEvtBuilderWin.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmFlibMcbm2018
CbmFlibFlesTools
CbmBase
@@ -194,7 +196,7 @@ set(SRCS CbmDeviceMcbmEventSink.cxx runMcbmEventSink.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmFlibMcbm2018
CbmFlibFlesTools
CbmBase
@@ -217,7 +219,7 @@ set(DEPENDENCIES
${FAIR_LIBS}
ParBase
${BOOST_LIBS}
- fles_ipc
+ external::fles_ipc
CbmFlibFlesTools
CbmBase
CbmRecoBase
@@ -285,7 +287,7 @@ set(SRCS CbmDeviceDigiEventSink.cxx runDigiEventSink.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmFlibMcbm2018
CbmFlibFlesTools
CbmBase
@@ -304,7 +306,7 @@ set(SRCS CbmDeviceEventSink.cxx runEventSink.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmFlibMcbm2018
CbmFlibFlesTools
CbmBase
@@ -318,6 +320,7 @@ set(DEPENDENCIES
)
GENERATE_EXECUTABLE()
+
# Set the correct variables for the installation
set(VMCWORKDIR ${CMAKE_INSTALL_PREFIX}/share/cbmroot)
diff --git a/MQ/monitor/CMakeLists.txt b/MQ/monitor/CMakeLists.txt
index 167ed6941f..455fb491b6 100644
--- a/MQ/monitor/CMakeLists.txt
+++ b/MQ/monitor/CMakeLists.txt
@@ -31,7 +31,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${FAIRMQ_INCLUDE_DIR}
${FAIRMQ_INCLUDE_DIR}/options
- ${IPC_INCLUDE_DIRECTORY}
+ ${FLES_IPC_INCLUDE_DIRECTORY}
${CBMROOT_SOURCE_DIR}/external/cppzmq
)
@@ -85,7 +85,7 @@ set(SRCS CbmDeviceMonitorT0.cxx runMonitorT0.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmFlibMcbm2018
CbmFlibFlesTools
CbmBase
@@ -103,7 +103,7 @@ set(SRCS CbmDeviceMonitorTof.cxx runMonitorTof.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmFlibMcbm2018
CbmFlibFlesTools
CbmBase
@@ -121,7 +121,7 @@ set(SRCS CbmDeviceMonitorReqT0.cxx runMonitorReqT0.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmFlibMcbm2018
CbmFlibFlesTools
CbmBase
@@ -139,7 +139,7 @@ set(SRCS CbmDeviceMonitorReqTof.cxx runMonitorReqTof.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmFlibMcbm2018
CbmFlibFlesTools
CbmBase
@@ -157,7 +157,7 @@ set(SRCS CbmDeviceMonitorPsd.cxx runMonitorPsd.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmFlibMcbm2018
CbmFlibFlesTools
CbmBase
diff --git a/MQ/sink/CMakeLists.txt b/MQ/sink/CMakeLists.txt
index 4f4374933d..c049540492 100644
--- a/MQ/sink/CMakeLists.txt
+++ b/MQ/sink/CMakeLists.txt
@@ -13,7 +13,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${FAIRMQ_INCLUDE_DIR}
${FAIRMQ_INCLUDE_DIR}/options
- ${IPC_INCLUDE_DIRECTORY}
+ ${FLES_IPC_INCLUDE_DIRECTORY}
${CBMROOT_SOURCE_DIR}/external/cppzmq
)
@@ -65,7 +65,7 @@ set(EXE_NAME DevNullSink)
set(SRCS CbmDevNullSink.cxx runDevNullSink.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
)
GENERATE_EXECUTABLE()
@@ -73,7 +73,7 @@ set(EXE_NAME TsaComponentSink)
set(SRCS CbmTsaComponentSink.cxx runTsaComponentSink.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
)
GENERATE_EXECUTABLE()
diff --git a/MQ/source/CMakeLists.txt b/MQ/source/CMakeLists.txt
index 043e5495f4..0f2055463f 100644
--- a/MQ/source/CMakeLists.txt
+++ b/MQ/source/CMakeLists.txt
@@ -27,7 +27,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${VMC_INCLUDE_DIRS}
${FAIRLOGGER_INCLUDE_DIR}
- ${IPC_INCLUDE_DIRECTORY}
+ ${FLES_IPC_INCLUDE_DIRECTORY}
${CBMROOT_SOURCE_DIR}/external/cppzmq
)
@@ -82,7 +82,7 @@ set(EXE_NAME TsaSampler)
set(SRCS CbmMQTsaSampler.cxx runTsaSampler.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmMQBase
)
GENERATE_EXECUTABLE()
@@ -91,7 +91,7 @@ set(EXE_NAME MultiTsaSampler)
set(SRCS CbmMQTsaMultiSampler.cxx runTsaMultiSampler.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmMQBase
CbmFlibFlesTools
Core
@@ -107,7 +107,7 @@ set(EXE_NAME RepReqTsSampler)
set(SRCS CbmMQTsSamplerRepReq.cxx runTsSamplerRepReq.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmMQBase
CbmFlibFlesTools
Core
@@ -124,7 +124,7 @@ set(EXE_NAME TsaSamplerTof)
set(SRCS CbmMQTsaSamplerTof.cxx runTsaSamplerTof.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmMQBase
)
GENERATE_EXECUTABLE()
@@ -133,7 +133,7 @@ set(EXE_NAME TsaMultiSamplerTof)
set(SRCS CbmMQTsaMultiSamplerTof.cxx runTsaMultiSamplerTof.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmMQBase
)
GENERATE_EXECUTABLE()
@@ -142,7 +142,7 @@ set(EXE_NAME TsaInfo)
set(SRCS CbmMQTsaInfo.cxx runTsaInfo.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmMQBase
)
GENERATE_EXECUTABLE()
@@ -171,7 +171,7 @@ set(EXE_NAME TsConsumerReqExample)
set(SRCS CbmTsConsumerReqDevExample.cxx runTsConsumerReqExample.cxx)
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmMQBase
CbmFlibFlesTools
Core
diff --git a/MQ/unpacker/CMakeLists.txt b/MQ/unpacker/CMakeLists.txt
index 7fbae2689a..f86bf2a21f 100644
--- a/MQ/unpacker/CMakeLists.txt
+++ b/MQ/unpacker/CMakeLists.txt
@@ -25,7 +25,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${FAIRMQ_INCLUDE_DIR}
${FAIRMQ_INCLUDE_DIR}/options
- ${IPC_INCLUDE_DIRECTORY}
+ ${FLES_IPC_INCLUDE_DIRECTORY}
${CBMROOT_SOURCE_DIR}/external/cppzmq
)
@@ -77,7 +77,7 @@ set(SRCS CbmTbDaqBuffer.cxx CbmDeviceUnpackTofMcbm2018.cxx runUnpackTofMcbm2018.
set(DEPENDENCIES
${DEPENDENCIES_ALL}
- fles_ipc
+ external::fles_ipc
CbmFlibMcbm2018
CbmTofBase
CbmBase
diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index a0eb6be563..15e152695d 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -23,7 +23,7 @@ target_include_directories(Algo
PUBLIC ${CMAKE_SOURCE_DIR}/core/data/tof
PUBLIC ${CMAKE_SOURCE_DIR}/core/data/psd
PUBLIC ${CMAKE_SOURCE_DIR}/core/data/raw
- PUBLIC ${CMAKE_SOURCE_DIR}/external/ipc/ipc/lib/fles_ipc
+ PUBLIC ${FLES_IPC_INCLUDE_DIRECTORY}
)
target_include_directories(Algo SYSTEM
diff --git a/algo/data/CMakeLists.txt b/algo/data/CMakeLists.txt
index 80dcea0ff7..90e3f7ff3b 100644
--- a/algo/data/CMakeLists.txt
+++ b/algo/data/CMakeLists.txt
@@ -40,7 +40,7 @@ target_include_directories(OnlineData
PUBLIC ${CMAKE_SOURCE_DIR}/core/data/psd
PUBLIC ${CMAKE_SOURCE_DIR}/core/data/global
PUBLIC ${CMAKE_SOURCE_DIR}/core/data/raw
- PUBLIC ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
+ PUBLIC ${FLES_IPC_INCLUDE_DIRECTORY}
)
target_include_directories(OnlineData SYSTEM
diff --git a/algo/test/CMakeLists.txt b/algo/test/CMakeLists.txt
index 5204a056dc..585175146e 100644
--- a/algo/test/CMakeLists.txt
+++ b/algo/test/CMakeLists.txt
@@ -31,7 +31,7 @@ Set(INCLUDE_DIRECTORIES
${CBMDATA_DIR}/much
${CBMDATA_DIR}/psd
${CBMDATA_DIR}/trd
- ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
+ ${FLES_IPC_INCLUDE_DIRECTORY}
${CMAKE_SOURCE_DIR}/algo
${CMAKE_SOURCE_DIR}/algo/trigger
${CMAKE_SOURCE_DIR}/algo/evbuild
diff --git a/core/data/CMakeLists.txt b/core/data/CMakeLists.txt
index bcd290d07a..e8e45041fb 100644
--- a/core/data/CMakeLists.txt
+++ b/core/data/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}/rich
${CMAKE_CURRENT_SOURCE_DIR}/psd
${CMAKE_CURRENT_SOURCE_DIR}/global
- ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
+ ${FLES_IPC_INCLUDE_DIRECTORY}
)
include_directories( ${INCLUDE_DIRECTORIES})
diff --git a/core/data/test/CMakeLists.txt b/core/data/test/CMakeLists.txt
index 826e045b52..87e7d2562f 100644
--- a/core/data/test/CMakeLists.txt
+++ b/core/data/test/CMakeLists.txt
@@ -35,7 +35,7 @@ Set(INCLUDE_DIRECTORIES
${CBMDATA_DIR}/much
${CBMDATA_DIR}/test/sts
${CBMDATA_DIR}/test/global
- ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
+ ${FLES_IPC_INCLUDE_DIRECTORY}
${BASE_INCLUDE_DIRECTORIES}
${GTEST_INCLUDE_DIR}
)
diff --git a/core/data/test/global/CMakeLists.txt b/core/data/test/global/CMakeLists.txt
index c105658806..247d73ea36 100644
--- a/core/data/test/global/CMakeLists.txt
+++ b/core/data/test/global/CMakeLists.txt
@@ -13,7 +13,7 @@ Set(INCLUDE_DIRECTORIES
${CBMDATA_DIR}/trd
${CBMDATA_DIR}/mvd
${CBMDATA_DIR}/test/sts
- ${CMAKE_SOURCE_DIR}/external/fles/flesnet/lib/fles_ipc
+ ${FLES_IPC_INCLUDE_DIRECTORY}
${BASE_INCLUDE_DIRECTORIES}
${GTEST_INCLUDE_DIR}
)
diff --git a/fles/cosy2019/CMakeLists.txt b/fles/cosy2019/CMakeLists.txt
index 1cc748ac27..9767a6993c 100644
--- a/fles/cosy2019/CMakeLists.txt
+++ b/fles/cosy2019/CMakeLists.txt
@@ -28,7 +28,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
${Boost_INCLUDE_DIR}
${ROOT_INCLUDE_DIR}
- ${IPC_INCLUDE_DIRECTORY}
+ ${FLES_IPC_INCLUDE_DIRECTORY}
)
Include_Directories(${INCLUDE_DIRECTORIES})
@@ -68,7 +68,7 @@ Set(LIBRARY_NAME CbmBeamtimeCosy2019)
Set(DEPENDENCIES
CbmFlibFlesTools CbmFlibMcbm2018
CbmStsBase
- CbmData CbmBase fles_ipc Eve Base
+ CbmData CbmBase external::fles_ipc Eve Base
)
GENERATE_LIBRARY()
diff --git a/fles/flestools/CMakeLists.txt b/fles/flestools/CMakeLists.txt
index d47694ab22..df1866b468 100644
--- a/fles/flestools/CMakeLists.txt
+++ b/fles/flestools/CMakeLists.txt
@@ -9,7 +9,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
${Boost_INCLUDE_DIR}
${ROOT_INCLUDE_DIR}
- ${IPC_INCLUDE_DIRECTORY}
+ ${FLES_IPC_INCLUDE_DIRECTORY}
)
Include_Directories(${INCLUDE_DIRECTORIES})
@@ -43,7 +43,7 @@ EndIf()
#Set(LINKDEF CbmFlibMcbm2018LinkDef.h )
Set(LIBRARY_NAME CbmFlibFlesTools)
Set(DEPENDENCIES
- fles_ipc Hist
+ external::fles_ipc Hist
)
GENERATE_LIBRARY()
diff --git a/fles/mcbm2018/CMakeLists.txt b/fles/mcbm2018/CMakeLists.txt
index 5a4d4e7f01..fa251c2284 100644
--- a/fles/mcbm2018/CMakeLists.txt
+++ b/fles/mcbm2018/CMakeLists.txt
@@ -37,7 +37,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
${Boost_INCLUDE_DIR}
${ROOT_INCLUDE_DIR}
- ${IPC_INCLUDE_DIRECTORY}
+ ${FLES_IPC_INCLUDE_DIRECTORY}
${CBMROOT_SOURCE_DIR}/external/flib_dpb/flib_dpb
${CMAKE_SOURCE_DIR}/external/cppzmq
)
@@ -136,7 +136,7 @@ Set(LIBRARY_NAME CbmFlibMcbm2018)
Set(DEPENDENCIES
CbmFlibFlesTools CbmStsBase CbmTofBase
CbmRichBase CbmMuchBase CbmTrdBase CbmPsdBase
- CbmData CbmBase fles_ipc Eve Base
+ CbmData CbmBase external::fles_ipc Eve Base
)
GENERATE_LIBRARY()
diff --git a/fles/star2019/CMakeLists.txt b/fles/star2019/CMakeLists.txt
index 43c843fe4d..7fb4e69f81 100644
--- a/fles/star2019/CMakeLists.txt
+++ b/fles/star2019/CMakeLists.txt
@@ -33,7 +33,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
${Boost_INCLUDE_DIR}
${ROOT_INCLUDE_DIR}
- ${IPC_INCLUDE_DIRECTORY}
+ ${FLES_IPC_INCLUDE_DIRECTORY}
${CBMROOT_SOURCE_DIR}/external/flib_dpb/flib_dpb
${CMAKE_SOURCE_DIR}/external/cppzmq
)
@@ -74,7 +74,7 @@ EndIf()
Set(LINKDEF CbmFlibStar2019LinkDef.h )
Set(LIBRARY_NAME CbmFlibStar2019)
Set(DEPENDENCIES
- CbmFlibMcbm2018 CbmData CbmBase fles_ipc Eve Base
+ CbmFlibMcbm2018 CbmData CbmBase external::fles_ipc Eve Base
)
GENERATE_LIBRARY()
diff --git a/reco/app/cbmreco_fairrun/CMakeLists.txt b/reco/app/cbmreco_fairrun/CMakeLists.txt
index 7d2068e4d5..a3a95653fb 100644
--- a/reco/app/cbmreco_fairrun/CMakeLists.txt
+++ b/reco/app/cbmreco_fairrun/CMakeLists.txt
@@ -20,7 +20,7 @@ target_link_directories(cbmreco_fairrun
)
target_link_libraries(cbmreco_fairrun
- fles_logging
+ external::fles_logging
CbmRecoTasks
Core
${Boost_LIBRARIES}
diff --git a/reco/base/CMakeLists.txt b/reco/base/CMakeLists.txt
index befd16ee00..75e9c1cd58 100644
--- a/reco/base/CMakeLists.txt
+++ b/reco/base/CMakeLists.txt
@@ -47,7 +47,7 @@ ${CBMROOT_SOURCE_DIR}/core/data/sts
set(SYSTEM_INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
-${IPC_INCLUDE_DIRECTORY}
+${FLES_IPC_INCLUDE_DIRECTORY}
)
# ---------------------------------------------------------
@@ -65,7 +65,7 @@ ${Boost_LIBRARY_DIRS}
# ----- Library dependences ---------------------------
Set(DEPENDENCIES
-fles_ipc
+external::fles_ipc
Base
CbmBase
#CbmData
diff --git a/reco/detectors/psd/CMakeLists.txt b/reco/detectors/psd/CMakeLists.txt
index 630ec235fc..310acce0b2 100644
--- a/reco/detectors/psd/CMakeLists.txt
+++ b/reco/detectors/psd/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(${INCLUDE_DIRECTORIES})
set(SYSTEM_INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
- ${IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
+ ${FLES_IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
)
include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
diff --git a/reco/detectors/rich/CMakeLists.txt b/reco/detectors/rich/CMakeLists.txt
index f4839c5a96..ff2ea0e09e 100644
--- a/reco/detectors/rich/CMakeLists.txt
+++ b/reco/detectors/rich/CMakeLists.txt
@@ -47,7 +47,7 @@ Include_Directories( ${INCLUDE_DIRECTORIES})
Set(SYSTEM_INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
${Boost_INCLUDE_DIR}
- ${IPC_INCLUDE_DIRECTORY} # for fles for unpacker
+ ${FLES_IPC_INCLUDE_DIRECTORY} # for fles for unpacker
)
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
diff --git a/reco/detectors/sts/CMakeLists.txt b/reco/detectors/sts/CMakeLists.txt
index 78c904eb80..8386c5ad44 100644
--- a/reco/detectors/sts/CMakeLists.txt
+++ b/reco/detectors/sts/CMakeLists.txt
@@ -66,7 +66,7 @@ ${CBMDETECTORBASE_DIR}/sts
set(SYSTEM_INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
-${IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
+${FLES_IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
)
# ---- End of include directories ------------------------
diff --git a/reco/detectors/tof/CMakeLists.txt b/reco/detectors/tof/CMakeLists.txt
index 0d5d628b84..05bdfb4894 100644
--- a/reco/detectors/tof/CMakeLists.txt
+++ b/reco/detectors/tof/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(${INCLUDE_DIRECTORIES})
set(SYSTEM_INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
- ${IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
+ ${FLES_IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
)
include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
diff --git a/reco/detectors/trd/CMakeLists.txt b/reco/detectors/trd/CMakeLists.txt
index e389e6b63d..cd60a09779 100644
--- a/reco/detectors/trd/CMakeLists.txt
+++ b/reco/detectors/trd/CMakeLists.txt
@@ -32,7 +32,7 @@ Include_Directories( ${INCLUDE_DIRECTORIES})
Set(SYSTEM_INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
${Boost_INCLUDE_DIR}
- ${IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
+ ${FLES_IPC_INCLUDE_DIRECTORY} # for fles infos for unpacker
)
Include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
diff --git a/reco/steer/CMakeLists.txt b/reco/steer/CMakeLists.txt
index ed7eea304b..3f19544f9f 100644
--- a/reco/steer/CMakeLists.txt
+++ b/reco/steer/CMakeLists.txt
@@ -60,7 +60,7 @@ ${CBMROOT_SOURCE_DIR}/algo/evbuild
set(SYSTEM_INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
-${IPC_INCLUDE_DIRECTORY}
+${FLES_IPC_INCLUDE_DIRECTORY}
)
# ---------------------------------------------------------
@@ -79,7 +79,7 @@ ${Boost_LIBRARY_DIRS}
# ----- Library dependences ---------------------------
Set(DEPENDENCIES
-fles_ipc
+external::fles_ipc
Base
CbmBase
CbmPsdBase
diff --git a/reco/tasks/CMakeLists.txt b/reco/tasks/CMakeLists.txt
index e98d6b0599..9b517ee4dc 100644
--- a/reco/tasks/CMakeLists.txt
+++ b/reco/tasks/CMakeLists.txt
@@ -44,7 +44,7 @@ ${CBMROOT_SOURCE_DIR}/algo/detectors/sts
set(SYSTEM_INCLUDE_DIRECTORIES
${BASE_INCLUDE_DIRECTORIES}
-${IPC_INCLUDE_DIRECTORY}
+${FLES_IPC_INCLUDE_DIRECTORY}
)
# ---------------------------------------------------------
@@ -62,7 +62,7 @@ ${Boost_LIBRARY_DIRS}
# ----- Library dependences ---------------------------
Set(DEPENDENCIES
-fles_ipc
+external::fles_ipc
Base
CbmBase
CbmData
--
GitLab