From 940afe3e5349710770dd6548955b003117c4fdf2 Mon Sep 17 00:00:00 2001
From: Dominik Smith <smith@th.physik.uni-frankfurt.de>
Date: Mon, 21 Feb 2022 11:24:47 +0100
Subject: [PATCH] Added C++17 requirement for compilation of CbmDeviceEventSink
and CbmDeviceEventBuilder.
---
MQ/mcbm/CMakeLists.txt | 89 ++++++++++++++++++++++--------------------
1 file changed, 47 insertions(+), 42 deletions(-)
diff --git a/MQ/mcbm/CMakeLists.txt b/MQ/mcbm/CMakeLists.txt
index efbafe0394..adf84ff5a7 100644
--- a/MQ/mcbm/CMakeLists.txt
+++ b/MQ/mcbm/CMakeLists.txt
@@ -261,29 +261,31 @@ set(DEPENDENCIES
)
GENERATE_EXECUTABLE()
-set(EXE_NAME EventBuilder)
-set(SRCS CbmDeviceEventBuilder.cxx runEventBuilder.cxx)
-
-set(DEPENDENCIES
- ${DEPENDENCIES}
- ${FAIR_LIBS}
- ${BOOST_LIBS}
- Algo
- CbmFlibFlesTools
- CbmEventBuilder
- KF
- L1
- CbmBase
- CbmRecoBase
- CbmData
- CbmTofBase
- Core
- RIO
- Net
- Hist
- RHTTP
-)
-GENERATE_EXECUTABLE()
+if (${CMAKE_CXX_STANDARD} EQUAL 17)
+ set(EXE_NAME EventBuilder)
+ set(SRCS CbmDeviceEventBuilder.cxx runEventBuilder.cxx)
+
+ set(DEPENDENCIES
+ ${DEPENDENCIES}
+ ${FAIR_LIBS}
+ ${BOOST_LIBS}
+ Algo
+ CbmFlibFlesTools
+ CbmEventBuilder
+ KF
+ L1
+ CbmBase
+ CbmRecoBase
+ CbmData
+ CbmTofBase
+ Core
+ RIO
+ Net
+ Hist
+ RHTTP
+ )
+ GENERATE_EXECUTABLE()
+endif()
#set(INCLUDE_DIRECTORIES
# ${CBMDATA_DIR}/base
@@ -312,23 +314,26 @@ set(DEPENDENCIES
#GENERATE_LIBRARY()
GENERATE_EXECUTABLE()
-set(EXE_NAME EventSink)
-set(SRCS CbmDeviceEventSink.cxx runEventSink.cxx)
+if (${CMAKE_CXX_STANDARD} EQUAL 17)
+ set(EXE_NAME EventSink)
+ set(SRCS CbmDeviceEventSink.cxx runEventSink.cxx)
+
+ set(DEPENDENCIES
+ ${DEPENDENCIES}
+ ${FAIR_LIBS}
+ ${BOOST_LIBS}
+ fles_ipc
+ CbmFlibMcbm2018
+ CbmFlibFlesTools
+ CbmBase
+ CbmData
+ Core
+ RIO
+ Tree
+ Net
+ Hist
+ RHTTP
+ )
+ GENERATE_EXECUTABLE()
+endif()
-set(DEPENDENCIES
- ${DEPENDENCIES}
- ${FAIR_LIBS}
- ${BOOST_LIBS}
- fles_ipc
- CbmFlibMcbm2018
- CbmFlibFlesTools
- CbmBase
- CbmData
- Core
- RIO
- Tree
- Net
- Hist
- RHTTP
-)
-GENERATE_EXECUTABLE()
--
GitLab