From e8982410b0f3cdc51d1aad4a94dd5dd936d9a61b Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Mon, 1 Jul 2019 21:56:50 +0200 Subject: [PATCH] adopted to the enforced changes by root 6.18.00. --- CMakeLists.txt | 6 +-- src/classes/CMakeLists.txt | 39 +++++++++----- src/external/BMWtools/CMakeLists.txt | 12 +++-- src/external/MagProximity/CMakeLists.txt | 19 ++++--- src/external/MusrRoot/CMakeLists.txt | 11 ++-- src/external/Nonlocal/CMakeLists.txt | 25 +++++---- src/external/TLemRunHeader/CMakeLists.txt | 18 ++++--- src/external/libBNMR/CMakeLists.txt | 12 +++-- .../libBNMR/libLineProfile/CMakeLists.txt | 9 +++- .../libCalcMeanFieldsLEM/CMakeLists.txt | 14 +++-- .../libFitPofB/classes/CMakeLists.txt | 53 ++++++++++--------- src/external/libGapIntegrals/CMakeLists.txt | 16 +++--- src/external/libGbGLF/CMakeLists.txt | 16 +++--- src/external/libLFRelaxation/CMakeLists.txt | 15 +++--- .../libPhotoMeissner/classes/CMakeLists.txt | 32 ++++++----- .../libSpinValve/classes/CMakeLists.txt | 26 +++++---- src/external/libZFRelaxation/CMakeLists.txt | 15 +++--- src/musredit_qt5/mupp/plotter/CMakeLists.txt | 22 ++++---- 18 files changed, 217 insertions(+), 143 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7e831c0..6b0851ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # - musrfit -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.9) -project(musrfit VERSION 1.5.0 LANGUAGES C CXX) +project(musrfit VERSION 1.5.1 LANGUAGES C CXX) #--- musrfit specific options ------------------------------------------------- option(nexus "build optional NeXus support. Needed for ISIS" OFF) @@ -67,7 +67,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) find_package(Git REQUIRED) #--- check for ROOT ----------------------------------------------------------- -find_package(ROOT 6.06 REQUIRED COMPONENTS Gui MathMore Minuit2 XMLParser) +find_package(ROOT 6.18 REQUIRED COMPONENTS Gui MathMore Minuit2 XMLParser) if (ROOT_mathmore_FOUND) execute_process(COMMAND root-config --bindir OUTPUT_VARIABLE ROOT_BINDIR) string(STRIP ${ROOT_BINDIR} ROOT_BINDIR) diff --git a/src/classes/CMakeLists.txt b/src/classes/CMakeLists.txt index 25e99c8a..c46855f0 100644 --- a/src/classes/CMakeLists.txt +++ b/src/classes/CMakeLists.txt @@ -2,41 +2,54 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${MUSRFIT_INC}) root_generate_dictionary( PFourierCanvasDict - -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC} -I${PREFIX_INC} PFourierCanvas.h + PFourierCanvas.h + OPTIONS + -I${MUSRFIT_REL_INC} -I${FFTW3_INCLUDE_DIR} + -inlineInputHeader LINKDEF ${MUSRFIT_INC}/PFourierCanvasLinkDef.h - OPTIONS -inlineInputHeader MODULE PFourierCanvas ) root_generate_dictionary( - PMusrCanvasDict - -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC} -I${PREFIX_INC} PMusrCanvas.h + PMusrCanvasDict + PMusrCanvas.h LINKDEF ${MUSRFIT_INC}/PMusrCanvasLinkDef.h - OPTIONS -inlineInputHeader + OPTIONS + -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC} + -inlineInputHeader MODULE PMusrCanvas ) root_generate_dictionary( PMusrT0Dict - -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC} -I${PREFIX_INC} PMusrT0.h + PMusrT0.h LINKDEF ${MUSRFIT_INC}/PMusrT0LinkDef.h - OPTIONS -inlineInputHeader + OPTIONS + -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC} + -inlineInputHeader MODULE PMusrT0 ) root_generate_dictionary( PStartupHandlerDict - -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC} -I${PREFIX_INC} PStartupHandler.h + PStartupHandler.h LINKDEF ${MUSRFIT_INC}/PStartupHandlerLinkDef.h - OPTIONS -inlineInputHeader + OPTIONS + -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC} + -inlineInputHeader MODULE PStartupHandler ) root_generate_dictionary( - PUserFcnBaseDict - -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC} -I${PREFIX_INC} PUserFcnBase.h + PUserFcnBaseDict + PUserFcnBase.h LINKDEF ${MUSRFIT_INC}/PUserFcnBaseLinkDef.h - OPTIONS -inlineInputHeader + OPTIONS + -inlineInputHeader + -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC} MODULE PUserFcnBase ) diff --git a/src/external/BMWtools/CMakeLists.txt b/src/external/BMWtools/CMakeLists.txt index 7a189984..ace6e883 100644 --- a/src/external/BMWtools/CMakeLists.txt +++ b/src/external/BMWtools/CMakeLists.txt @@ -3,13 +3,19 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) set(CUBA_INC ${CMAKE_SOURCE_DIR}/src/external/libCuba/src) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) + +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) root_generate_dictionary( BMWStartupHandlerDict - -I${MUSRFIT_INC} -I${PREFIX_INC} BMWStartupHandler.h + BMWStartupHandler.h + OPTIONS + -I${MUSRFIT_INC} + -inlineInputHeader LINKDEF BMWStartupHandlerLinkDef.h - OPTIONS -inlineInputHeader MODULE BMWStartupHandler ) diff --git a/src/external/MagProximity/CMakeLists.txt b/src/external/MagProximity/CMakeLists.txt index 7aa988ee..2e09a573 100644 --- a/src/external/MagProximity/CMakeLists.txt +++ b/src/external/MagProximity/CMakeLists.txt @@ -2,27 +2,26 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) root_generate_dictionary( PMagProximityFitterDict - -I${FFTW3_INCLUDE_DIR} - -I${MUSRFIT_INC} - -I${CMAKE_CURRENT_SOURCE_DIR} - -I${PREFIX_INC} PMagProximityFitter.h + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${MUSRFIT_INC} + -I${CMAKE_CURRENT_SOURCE_DIR} + -inlineInputHeader LINKDEF PMagProximityFitterLinkDef.h - OPTIONS -inlineInputHeader MODULE PMagProximityFitter ) root_generate_dictionary( PMPStartupHandlerDict - -I${MUSRFIT_INC} - -I${CMAKE_CURRENT_SOURCE_DIR} - -I${PREFIX_INC} PMPStartupHandler.h + OPTIONS + -I${MUSRFIT_INC} + -I${CMAKE_CURRENT_SOURCE_DIR} + -inlineInputHeader LINKDEF PMPStartupHandlerLinkDef.h - OPTIONS -inlineInputHeader MODULE PMPStartupHandler ) diff --git a/src/external/MusrRoot/CMakeLists.txt b/src/external/MusrRoot/CMakeLists.txt index 9914f57e..d30cac56 100644 --- a/src/external/MusrRoot/CMakeLists.txt +++ b/src/external/MusrRoot/CMakeLists.txt @@ -2,13 +2,18 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRROOT_INC ${CMAKE_SOURCE_DIR}/src/external/MusrRoot) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) root_generate_dictionary( TMusrRunHeaderDict - -I${MUSRROOT_INC} -I${PREFIX_INC} TMusrRunHeader.h + TMusrRunHeader.h + OPTIONS + -I${MUSRROOT_INC} + -inlineInputHeader LINKDEF TMusrRunHeaderLinkDef.h - OPTIONS -inlineInputHeader MODULE TMusrRunHeader ) diff --git a/src/external/Nonlocal/CMakeLists.txt b/src/external/Nonlocal/CMakeLists.txt index 10d67ccb..f28725cd 100644 --- a/src/external/Nonlocal/CMakeLists.txt +++ b/src/external/Nonlocal/CMakeLists.txt @@ -3,28 +3,31 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) set(NONLOCAL_INC ${CMAKE_SOURCE_DIR}/src/external/Nonlocal) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${MUSRFIT_INC} ${NONLOCAL_INC}) root_generate_dictionary( PNL_PippardFitterDict - -I${FFTW3_INCLUDE_DIR} - -I${MUSRFIT_INC} - -I${NONLOCAL_INC} - -I${CMAKE_CURRENT_SOURCE_DIR} - -I${PREFIX_INC} PNL_PippardFitter.h + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${MUSRFIT_INC} + -I${NONLOCAL_INC} + -I${CMAKE_CURRENT_SOURCE_DIR} + -inlineInputHeader LINKDEF PNL_PippardFitterLinkDef.h - OPTIONS -inlineInputHeader MODULE PNL_PippardFitter ) root_generate_dictionary( PNL_StartupHandlerDict - -I${NONLOCAL_INC} - -I${CMAKE_CURRENT_SOURCE_DIR} - -I${PREFIX_INC} PNL_StartupHandler.h + OPTIONS + -I${NONLOCAL_INC} + -I${CMAKE_CURRENT_SOURCE_DIR} + -inlineInputHeader LINKDEF PNL_StartupHandlerLinkDef.h - OPTIONS -inlineInputHeader MODULE PNL_StartupHandler ) diff --git a/src/external/TLemRunHeader/CMakeLists.txt b/src/external/TLemRunHeader/CMakeLists.txt index 4dbc8fe9..df5e99da 100644 --- a/src/external/TLemRunHeader/CMakeLists.txt +++ b/src/external/TLemRunHeader/CMakeLists.txt @@ -1,21 +1,27 @@ # -TLemRunHeader library ------------------------------------------------------ #--- generate necessary dictionaries ------------------------------------------ -set(TLEMRUNHEADER_INC ${CMAKE_SOURCE_DIR}/src/external/TLemRunHeader) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) root_generate_dictionary( TLemRunHeaderDict - -I${TLEMRUNHEADER_INC} -I${PREFIX_INC} TLemRunHeader.h + TLemRunHeader.h + OPTIONS + -I${CMAKE_CURRENT_SOURCE_DIR} + -inlineInputHeader LINKDEF TLemRunHeaderLinkDef.h - OPTIONS -inlineInputHeader MODULE TLemRunHeader ) root_generate_dictionary( TLemStatsDict - -I${TLEMRUNHEADER_INC} -I${PREFIX_INC} TLemStats.h + TLemStats.h + OPTIONS + -I${CMAKE_CURRENT_SOURCE_DIR} + -inlineInputHeader LINKDEF TLemStatsLinkDef.h - OPTIONS -inlineInputHeader MODULE TLemStats ) diff --git a/src/external/libBNMR/CMakeLists.txt b/src/external/libBNMR/CMakeLists.txt index de1596b1..04661a65 100644 --- a/src/external/libBNMR/CMakeLists.txt +++ b/src/external/libBNMR/CMakeLists.txt @@ -5,13 +5,19 @@ add_subdirectory(libLineProfile) #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${CMAKE_CURRENT_BINARY_DIR}) root_generate_dictionary( TBNMRDict - -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC} -I${PREFIX_INC} TBNMR.h + TBNMR.h + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${MUSRFIT_INC} + -inlineInputHeader LINKDEF TBNMRLinkDef.h - OPTIONS -inlineInputHeader MODULE TBNMR ) diff --git a/src/external/libBNMR/libLineProfile/CMakeLists.txt b/src/external/libBNMR/libLineProfile/CMakeLists.txt index 5ba98448..58c571ef 100644 --- a/src/external/libBNMR/libLineProfile/CMakeLists.txt +++ b/src/external/libBNMR/libLineProfile/CMakeLists.txt @@ -2,12 +2,17 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${CMAKE_CURRENT_BINARY_DIR}) root_generate_dictionary( LineProfileDict - -I${FFTW3_INCLUDE_DIR} - -I${MUSRFIT_INC} LineProfile.h + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${MUSRFIT_INC} LINKDEF LineProfileLinkDef.h MODULE LineProfile ) diff --git a/src/external/libCalcMeanFieldsLEM/CMakeLists.txt b/src/external/libCalcMeanFieldsLEM/CMakeLists.txt index 9300811c..7838b8cc 100644 --- a/src/external/libCalcMeanFieldsLEM/CMakeLists.txt +++ b/src/external/libCalcMeanFieldsLEM/CMakeLists.txt @@ -4,13 +4,21 @@ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) set(BMW_TOOLS_INC ${CMAKE_SOURCE_DIR}/src/external/BMWtools) set(POFB_INC ${CMAKE_SOURCE_DIR}/src/external/libFitPofB/include) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) root_generate_dictionary( TCalcMeanFieldsLEMDict - -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC} -I${BMW_TOOLS_INC} -I${POFB_INC} -I${PREFIX_INC} TCalcMeanFieldsLEM.h + TCalcMeanFieldsLEM.h + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${MUSRFIT_INC} + -I${BMW_TOOLS_INC} + -I${POFB_INC} + -inlineInputHeader LINKDEF TCalcMeanFieldsLEMLinkDef.h - OPTIONS -inlineInputHeader MODULE TCalcMeanFieldsLEM ) diff --git a/src/external/libFitPofB/classes/CMakeLists.txt b/src/external/libFitPofB/classes/CMakeLists.txt index 08f2e675..6081a49d 100644 --- a/src/external/libFitPofB/classes/CMakeLists.txt +++ b/src/external/libFitPofB/classes/CMakeLists.txt @@ -3,46 +3,47 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) set(BMW_TOOLS_INC ${CMAKE_SOURCE_DIR}/src/external/BMWtools) -set(POFB_INC ${CMAKE_SOURCE_DIR}/src/external/libFitPofB/include) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +set(FIT_P_OF_B_INC ${CMAKE_CURRENT_SOURCE_DIR}/../include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${FIT_P_OF_B_INC}) root_generate_dictionary( TLondon1DDict - -I${FFTW3_INCLUDE_DIR} - -I${MUSRFIT_INC} - -I${BMW_TOOLS_INC} - -I${POFB_INC} - -I${CMAKE_CURRENT_SOURCE_DIR}/../include - -I${PREFIX_INC} TLondon1D.h - LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/TLondon1DLinkDef.h - OPTIONS -inlineInputHeader + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${MUSRFIT_INC} + -I${BMW_TOOLS_INC} + -I${FIT_P_OF_B_INC} + -inlineInputHeader + LINKDEF ${FIT_P_OF_B_INC}/TLondon1DLinkDef.h MODULE TLondon1D ) root_generate_dictionary( TVortexDict - -I${FFTW3_INCLUDE_DIR} - -I${MUSRFIT_INC} - -I${BMW_TOOLS_INC} - -I${POFB_INC} - -I${CMAKE_CURRENT_SOURCE_DIR}/../include - -I${PREFIX_INC} TVortex.h - LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/TVortexLinkDef.h - OPTIONS -inlineInputHeader + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${MUSRFIT_INC} + -I${BMW_TOOLS_INC} + -I${FIT_P_OF_B_INC} + -inlineInputHeader + LINKDEF ${FIT_P_OF_B_INC}/TVortexLinkDef.h MODULE TVortex ) root_generate_dictionary( TSkewedGssDict - -I${FFTW3_INCLUDE_DIR} - -I${MUSRFIT_INC} - -I${BMW_TOOLS_INC} - -I${POFB_INC} - -I${CMAKE_CURRENT_SOURCE_DIR}/../include - -I${PREFIX_INC} TSkewedGss.h - LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/TSkewedGssLinkDef.h - OPTIONS -inlineInputHeader + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${MUSRFIT_INC} + -I${BMW_TOOLS_INC} + -I${POFB_INC} + -I${FIT_P_OF_B_INC} + -inlineInputHeader + LINKDEF ${FIT_P_OF_B_INC}/TSkewedGssLinkDef.h MODULE TSkewedGss ) diff --git a/src/external/libGapIntegrals/CMakeLists.txt b/src/external/libGapIntegrals/CMakeLists.txt index 76d191df..3a6896bf 100644 --- a/src/external/libGapIntegrals/CMakeLists.txt +++ b/src/external/libGapIntegrals/CMakeLists.txt @@ -3,17 +3,21 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) set(BMW_TOOLS_INC ${CMAKE_SOURCE_DIR}/src/external/BMWtools) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) root_generate_dictionary( TGapIntegralsDict - -I${FFTW3_INCLUDE_DIR} - -I${MUSRFIT_INC} - -I${BMW_TOOLS_INC} - -I${PREFIX_INC} TGapIntegrals.h + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${MUSRFIT_INC} + -I${BMW_TOOLS_INC} + -I${CMAKE_CURRENT_SOURCE_DIR} + -inlineInputHeader LINKDEF TGapIntegralsLinkDef.h - OPTIONS -inlineInputHeader MODULE TGapIntegrals ) diff --git a/src/external/libGbGLF/CMakeLists.txt b/src/external/libGbGLF/CMakeLists.txt index 4edfdbf9..0a531afd 100644 --- a/src/external/libGbGLF/CMakeLists.txt +++ b/src/external/libGbGLF/CMakeLists.txt @@ -2,18 +2,20 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) -set(GBGLF_INC ${CMAKE_SOURCE_DIR}/src/external/libGbGLF) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) + +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) root_generate_dictionary( PGbGLFDict - -I${GBGLF_INC} - -I${MUSRFIT_INC} - -I${CMAKE_CURRENT_SOURCE_DIR} - -I${PREFIX_INC} PGbGLF.h + OPTIONS + -I${MUSRFIT_INC} + -I${CMAKE_CURRENT_SOURCE_DIR} + -inlineInputHeader LINKDEF PGbGLFLinkDef.h - OPTIONS -inlineInputHeader MODULE PGbGLF ) diff --git a/src/external/libLFRelaxation/CMakeLists.txt b/src/external/libLFRelaxation/CMakeLists.txt index 31b66b5f..dfe5586f 100644 --- a/src/external/libLFRelaxation/CMakeLists.txt +++ b/src/external/libLFRelaxation/CMakeLists.txt @@ -3,17 +3,20 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) set(BMW_TOOLS_INC ${CMAKE_SOURCE_DIR}/src/external/BMWtools) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) root_generate_dictionary( TLFRelaxationDict - -I${FFTW3_INCLUDE_DIR} - -I${MUSRFIT_INC} - -I${BMW_TOOLS_INC} - -I${PREFIX_INC} TLFRelaxation.h + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${MUSRFIT_INC} + -I${BMW_TOOLS_INC} + -inlineInputHeader LINKDEF TLFRelaxationLinkDef.h - OPTIONS -inlineInputHeader MODULE TLFRelaxation ) diff --git a/src/external/libPhotoMeissner/classes/CMakeLists.txt b/src/external/libPhotoMeissner/classes/CMakeLists.txt index 93a57b46..2cbb7432 100644 --- a/src/external/libPhotoMeissner/classes/CMakeLists.txt +++ b/src/external/libPhotoMeissner/classes/CMakeLists.txt @@ -2,29 +2,33 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +set(PHOTO_MEISSNER_INC ${CMAKE_CURRENT_SOURCE_DIR}/../include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${PHOTO_MEISSNER_INC}) root_generate_dictionary( PPhotoMeissnerDict - -I${FFTW3_INCLUDE_DIR} - -I${GSL_INCLUDE_DIRS} - -I${ROOT_INCLUDE_DIRS} - -I${MUSRFIT_INC} - -I${CMAKE_CURRENT_SOURCE_DIR}/../include - -I${PREFIX_INC} PPhotoMeissner.h - LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/PPhotoMeissnerLinkDef.h - OPTIONS -inlineInputHeader + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${GSL_INCLUDE_DIRS} + -I${ROOT_INCLUDE_DIRS} + -I${MUSRFIT_INC} + -I${PHOTO_MEISSNER_INC} + -inlineInputHeader + LINKDEF ${PHOTO_MEISSNER_INC}/PPhotoMeissnerLinkDef.h MODULE PPhotoMeissner ) root_generate_dictionary( PStartupHandler_PMDict - -I${MUSRFIT_INC} - -I${CMAKE_CURRENT_SOURCE_DIR}/../include - -I${PREFIX_INC} PStartupHandler_PM.h - LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/PStartupHandler_PMLinkDef.h - OPTIONS -inlineInputHeader + OPTIONS + -I${MUSRFIT_INC} + -I${PHOTO_MEISSNER_INC} + -inlineInputHeader + LINKDEF ${PHOTO_MEISSNER_INC}/PStartupHandler_PMLinkDef.h MODULE PStartupHandler_PM ) diff --git a/src/external/libSpinValve/classes/CMakeLists.txt b/src/external/libSpinValve/classes/CMakeLists.txt index 890742d8..0177a564 100644 --- a/src/external/libSpinValve/classes/CMakeLists.txt +++ b/src/external/libSpinValve/classes/CMakeLists.txt @@ -2,26 +2,30 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +set(SPIN_VALVE_INC ${CMAKE_CURRENT_SOURCE_DIR}/../include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${SPIN_VALVE_INC}) root_generate_dictionary( PSkewedLorentzianDict - -I${FFTW3_INCLUDE_DIR} - -I${MUSRFIT_INC} - -I${CMAKE_CURRENT_SOURCE_DIR}/../include - -I${PREFIX_INC} PSkewedLorentzian.h - LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/PSkewedLorentzianLinkDef.h - OPTIONS -inlineInputHeader + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${MUSRFIT_INC} + -I${SPIN_VALVE_INC} + -inlineInputHeader + LINKDEF ${SPIN_VALVE_INC}/PSkewedLorentzianLinkDef.h MODULE PSkewedLorentzian ) root_generate_dictionary( PStartupHandler_SVDict - -I${CMAKE_CURRENT_SOURCE_DIR}/../include - -I${PREFIX_INC} PStartupHandler_SV.h - LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/PStartupHandler_SVLinkDef.h - OPTIONS -inlineInputHeader + OPTIONS + -I${SPIN_VALVE_INC} + -inlineInputHeader + LINKDEF ${SPIN_VALVE_INC}/PStartupHandler_SVLinkDef.h MODULE PStartupHandler_SV ) diff --git a/src/external/libZFRelaxation/CMakeLists.txt b/src/external/libZFRelaxation/CMakeLists.txt index 8b32160f..412ed041 100644 --- a/src/external/libZFRelaxation/CMakeLists.txt +++ b/src/external/libZFRelaxation/CMakeLists.txt @@ -3,17 +3,20 @@ #--- generate necessary dictionaries ------------------------------------------ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) set(BMW_TOOLS_INC ${CMAKE_SOURCE_DIR}/src/external/BMWtools) -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) root_generate_dictionary( ZFRelaxationDict - -I${FFTW3_INCLUDE_DIR} - -I${MUSRFIT_INC} - -I${BMW_TOOLS_INC} - -I${PREFIX_INC} ZFRelaxation.h + OPTIONS + -I${FFTW3_INCLUDE_DIR} + -I${MUSRFIT_INC} + -I${BMW_TOOLS_INC} + -inlineInputHeader LINKDEF ZFRelaxationLinkDef.h - OPTIONS -inlineInputHeader MODULE ZFRelaxation ) diff --git a/src/musredit_qt5/mupp/plotter/CMakeLists.txt b/src/musredit_qt5/mupp/plotter/CMakeLists.txt index 5ae58a4b..c0b83035 100644 --- a/src/musredit_qt5/mupp/plotter/CMakeLists.txt +++ b/src/musredit_qt5/mupp/plotter/CMakeLists.txt @@ -24,28 +24,30 @@ set(SOURCE set ( PLOT_DIR ${CMAKE_CURRENT_BINARY_DIR} ) - -set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) +# ROOT requires that the dictonary header files are found at configuration time. +# Hence, target_include_directories cannot be used here because, targets are +# setup only afterwards. +include_directories(${PLOT_DIR}) #--- generate necessary dictionaries ------------------------------------------ root_generate_dictionary( PMuppCanvasDict - -I${CMAKE_CURRENT_SOURCE_DIR} - -I${CMAKE_CURRENT_SOURCE_DIR}/.. - -I${PREFIX_INC} PMuppCanvas.h + OPTIONS + -I${CMAKE_CURRENT_SOURCE_DIR} + -I${CMAKE_CURRENT_SOURCE_DIR}/.. + -inlineInputHeader LINKDEF PMuppCanvasLinkDef.h - OPTIONS -inlineInputHeader MODULE PMuppCanvas ) root_generate_dictionary( PMuppStartupHandlerDict - -I${CMAKE_CURRENT_SOURCE_DIR} - -I${CMAKE_CURRENT_SOURCE_DIR}/.. - -I${PREFIX_INC} PMuppStartupHandler.h + OPTIONS + -I${CMAKE_CURRENT_SOURCE_DIR} + -I${CMAKE_CURRENT_SOURCE_DIR}/.. + -inlineInputHeader LINKDEF PMuppStartupHandlerLinkDef.h - OPTIONS -inlineInputHeader MODULE PMuppStartupHandler )