LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

changes needed since upcoming ROOT6.24 (minuit2) will break the backward compatibility.

Browse Source
This commit is contained in:
suter_a 2021-04-09 10:03:34 +02:00
parent 38b289b99f
commit c06f510aff
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -82,6 +82,14 @@ if (ROOT_mathmore_FOUND)
include(${ROOT_USE_FILE}) include(${ROOT_USE_FILE})
endif (ROOT_mathmore_FOUND) endif (ROOT_mathmore_FOUND)
#--- the next check is need to set a flag, since root 6.24 (minuit2) breaks
#--- the backwards compatibility. ---------------------------------------------
if (ROOT_VERSION VERSION_LESS "6.24")
set(ROOT_GRTEQ_24 0)
else ()
set(ROOT_GRTEQ_24 1)
endif ()
#--- check for boost ---------------------------------------------------------- #--- check for boost ----------------------------------------------------------
find_package(Boost REQUIRED find_package(Boost REQUIRED
COMPONENTS COMPONENTS
@ -119,7 +127,7 @@ if (qt_based_tools)
# check for any Qt, i.e. AUTO # check for any Qt, i.e. AUTO
if (qt_version STREQUAL AUTO) if (qt_version STREQUAL AUTO)
# try Qt6 # try Qt6
find_package(Qt6Core) find_package(Qt6Core QUIET)
if (Qt6Core_FOUND) if (Qt6Core_FOUND)
find_package(Qt6Widgets CONFIG REQUIRED) find_package(Qt6Widgets CONFIG REQUIRED)
find_package(Qt6Xml CONFIG REQUIRED) find_package(Qt6Xml CONFIG REQUIRED)
@ -129,7 +137,7 @@ if (qt_based_tools)
endif (Qt6Core_FOUND) endif (Qt6Core_FOUND)
# try Qt5 # try Qt5
if (NOT Qt6Core_FOUND) if (NOT Qt6Core_FOUND)
find_package(Qt5Core) find_package(Qt5Core QUIET)
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
find_package(Qt5Widgets CONFIG REQUIRED) find_package(Qt5Widgets CONFIG REQUIRED)
find_package(Qt5Xml CONFIG REQUIRED) find_package(Qt5Xml CONFIG REQUIRED)

3
cmake/config.h.in
View File

@ -3,6 +3,9 @@
#define PACKAGE_VERSION "@PROJECT_VERSION@" #define PACKAGE_VERSION "@PROJECT_VERSION@"
#define ROOT_VERSION_USED "@ROOT_VERSION@" #define ROOT_VERSION_USED "@ROOT_VERSION@"
// define to 1 if minor ROOT6 version is >= 24
#define ROOT_GRTEQ_24 @ROOT_GRTEQ_24@
// define to 1 if you have <alloca.h> and it should be used // define to 1 if you have <alloca.h> and it should be used
#cmakedefine HAVE_ALLOCA_H 1 #cmakedefine HAVE_ALLOCA_H 1

4
src/classes/PFitter.cpp
View File

@ -1840,7 +1840,11 @@ Bool_t PFitter::ExecutePrintLevel(UInt_t lineNo)
return false; return false;
} }
#ifdef ROOT_GRTEQ_24
ROOT::Minuit2::MnPrint::SetGlobalLevel(fPrintLevel);
#else
ROOT::Minuit2::MnPrint::SetLevel(fPrintLevel); ROOT::Minuit2::MnPrint::SetLevel(fPrintLevel);
#endif
// clean up // clean up
if (tokens) { if (tokens) {