Skip to content
Snippets Groups Projects
Commit 08787c8f authored by Administrator's avatar Administrator
Browse files

Add CMake variable to define C++ version

Use standard CMake variable to define C++ version.
Pass the version to AnalysisTree package such that code is properly
compiled.
parent 03825a47
No related branches found
No related tags found
1 merge request!191Fix CbmRoot for FairSoft nov20 usage
......@@ -93,8 +93,14 @@ If(${POS_C++11} EQUAL -1)
String(FIND ${_res_fairsoft_config} "-std=c++17" POS_C++11)
If(${POS_C++11} EQUAL -1)
Message(FATAL_ERROR "FairSoft wasn't compiled with support for c++11 or above. Please recompile FairSoft with a compiler which supports c++11, c++14 or c++17.")
else()
set(CMAKE_CXX_STANDARD 17)
EndIf()
else()
set(CMAKE_CXX_STANDARD 14)
EndIf()
else()
set(CMAKE_CXX_STANDARD 11)
EndIf()
Execute_process(COMMAND $ENV{SIMPATH}/bin/fairsoft-config --root-version OUTPUT_VARIABLE _res_root_version OUTPUT_STRIP_TRAILING_WHITESPACE)
......
......@@ -31,7 +31,7 @@ ExternalProject_Add(ANALYSISTREE
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DCMAKE_CXX_STANDARD=11
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DROOTSYS=${SIMPATH}
-DBOOST_ROOT=${SIMPATH}
-DBoost_NO_BOOST_CMAKE=ON
......
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