From 55b5788506ee701762a20647ae721f00acedea4d Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Thu, 28 Jun 2018 13:17:43 +0200 Subject: [PATCH] added MODULE to root_generate_dictionary in order to get the proper name scheme. --- src/classes/CMakeLists.txt | 25 +++++++++++-------- src/external/BMWtools/CMakeLists.txt | 5 ++-- src/external/MagProximity/CMakeLists.txt | 10 +++++--- src/external/MusrRoot/CMakeLists.txt | 5 ++-- src/external/Nonlocal/CMakeLists.txt | 10 +++++--- src/external/TLemRunHeader/CMakeLists.txt | 12 +++++---- src/external/libBNMR/CMakeLists.txt | 5 ++-- .../libCalcMeanFieldsLEM/CMakeLists.txt | 5 ++-- .../libFitPofB/classes/CMakeLists.txt | 15 ++++++----- src/external/libGapIntegrals/CMakeLists.txt | 5 ++-- src/external/libLFRelaxation/CMakeLists.txt | 5 ++-- .../libPhotoMeissner/classes/CMakeLists.txt | 10 +++++--- .../libSpinValve/classes/CMakeLists.txt | 10 +++++--- src/external/libZFRelaxation/CMakeLists.txt | 5 ++-- src/musredit_qt5/mupp/plotter/CMakeLists.txt | 2 ++ 15 files changed, 78 insertions(+), 51 deletions(-) diff --git a/src/classes/CMakeLists.txt b/src/classes/CMakeLists.txt index 64a03d90..f64feace 100644 --- a/src/classes/CMakeLists.txt +++ b/src/classes/CMakeLists.txt @@ -7,26 +7,31 @@ root_generate_dictionary( PFourierCanvasDict -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PFourierCanvas.h LINKDEF ${MUSRFIT_INC}/PFourierCanvasLinkDef.h + MODULE PFourierCanvas ) root_generate_dictionary( PMusrCanvasDict -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PMusrCanvas.h LINKDEF ${MUSRFIT_INC}/PMusrCanvasLinkDef.h + MODULE PMusrCanvas ) root_generate_dictionary( PMusrT0Dict -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PMusrT0.h LINKDEF ${MUSRFIT_INC}/PMusrT0LinkDef.h + MODULE PMusrT0 ) root_generate_dictionary( PStartupHandlerDict -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PStartupHandler.h LINKDEF ${MUSRFIT_INC}/PStartupHandlerLinkDef.h + MODULE PStartupHandler ) root_generate_dictionary( PUserFcnBaseDict -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PUserFcnBase.h LINKDEF ${MUSRFIT_INC}/PUserFcnBaseLinkDef.h + MODULE PUserFcnBase ) #--- create pkg-config info --------------------------------------------------- @@ -140,16 +145,16 @@ install(TARGETS PMusr DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libPFourierCanvasDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPFourierCanvasDict.rootmap - ${CMAKE_CURRENT_BINARY_DIR}/libPMusrCanvasDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPMusrCanvasDict.rootmap - ${CMAKE_CURRENT_BINARY_DIR}/libPMusrT0Dict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPMusrT0Dict.rootmap - ${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandlerDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandlerDict.rootmap - ${CMAKE_CURRENT_BINARY_DIR}/libPUserFcnBaseDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPUserFcnBaseDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libPFourierCanvas_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPFourierCanvas.rootmap + ${CMAKE_CURRENT_BINARY_DIR}/libPMusrCanvas_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPMusrCanvas.rootmap + ${CMAKE_CURRENT_BINARY_DIR}/libPMusrT0_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPMusrT0.rootmap + ${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandler_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandler.rootmap + ${CMAKE_CURRENT_BINARY_DIR}/libPUserFcnBase_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPUserFcnBase.rootmap DESTINATION lib ) diff --git a/src/external/BMWtools/CMakeLists.txt b/src/external/BMWtools/CMakeLists.txt index a8e9b9cb..3341b698 100644 --- a/src/external/BMWtools/CMakeLists.txt +++ b/src/external/BMWtools/CMakeLists.txt @@ -9,6 +9,7 @@ root_generate_dictionary( -I${MUSRFIT_INC} BMWStartupHandler.h LINKDEF BMWStartupHandlerLinkDef.h + MODULE BMWStartupHandler ) #--- create pkg-config info --------------------------------------------------- @@ -53,8 +54,8 @@ install(TARGETS BMWtools DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libBMWStartupHandlerDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libBMWStartupHandlerDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libBMWStartupHandler_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libBMWStartupHandler.rootmap DESTINATION lib ) diff --git a/src/external/MagProximity/CMakeLists.txt b/src/external/MagProximity/CMakeLists.txt index c2c47b14..79a4ba64 100644 --- a/src/external/MagProximity/CMakeLists.txt +++ b/src/external/MagProximity/CMakeLists.txt @@ -8,12 +8,14 @@ root_generate_dictionary( -I${MUSRFIT_INC} PMagProximityFitter.h LINKDEF PMagProximityFitterLinkDef.h + MODULE PMagProximityFitter ) root_generate_dictionary( PMPStartupHandlerDict -I${MUSRFIT_INC} PMPStartupHandler.h LINKDEF PMPStartupHandlerLinkDef.h + MODULE PMPStartupHandler ) #--- create pkg-config info --------------------------------------------------- @@ -55,10 +57,10 @@ install(TARGETS PMagProximityFitter DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libPMagProximityFitterDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPMagProximityFitterDict.rootmap - ${CMAKE_CURRENT_BINARY_DIR}/libPMPStartupHandlerDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPMPStartupHandlerDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libPMagProximityFitter_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPMagProximityFitter.rootmap + ${CMAKE_CURRENT_BINARY_DIR}/libPMPStartupHandler_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPMPStartupHandler.rootmap DESTINATION lib ) diff --git a/src/external/MusrRoot/CMakeLists.txt b/src/external/MusrRoot/CMakeLists.txt index 91e1c52a..b2112b17 100644 --- a/src/external/MusrRoot/CMakeLists.txt +++ b/src/external/MusrRoot/CMakeLists.txt @@ -3,6 +3,7 @@ #--- generate necessary dictionaries ------------------------------------------ root_generate_dictionary( TMusrRunHeaderDict TMusrRunHeader.h LINKDEF TMusrRunHeaderLinkDef.h + MODULE TMusrRunHeader ) #--- create pkg-config info --------------------------------------------------- @@ -38,8 +39,8 @@ install(TARGETS TMusrRunHeader DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libTMusrRunHeaderDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libTMusrRunHeaderDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libTMusrRunHeader_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libTMusrRunHeader.rootmap DESTINATION lib ) diff --git a/src/external/Nonlocal/CMakeLists.txt b/src/external/Nonlocal/CMakeLists.txt index 815615f4..13127cc3 100644 --- a/src/external/Nonlocal/CMakeLists.txt +++ b/src/external/Nonlocal/CMakeLists.txt @@ -9,9 +9,11 @@ root_generate_dictionary( -I${MUSRFIT_INC} PNL_PippardFitter.h LINKDEF PNL_PippardFitterLinkDef.h + MODULE PNL_PippardFitter ) root_generate_dictionary( PNL_StartupHandlerDict PNL_StartupHandler.h LINKDEF PNL_StartupHandlerLinkDef.h + MODULE PNL_StartupHandler ) #--- create pkg-config info --------------------------------------------------- @@ -53,10 +55,10 @@ install(TARGETS PNL_PippardFitter DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libPNL_PippardFitterDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPNL_PippardFitterDict.rootmap - ${CMAKE_CURRENT_BINARY_DIR}/libPNL_StartupHandlerDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPNL_StartupHandlerDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libPNL_PippardFitter_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPNL_PippardFitter.rootmap + ${CMAKE_CURRENT_BINARY_DIR}/libPNL_StartupHandler_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPNL_StartupHandler.rootmap DESTINATION lib ) diff --git a/src/external/TLemRunHeader/CMakeLists.txt b/src/external/TLemRunHeader/CMakeLists.txt index d3bfb436..d361da50 100644 --- a/src/external/TLemRunHeader/CMakeLists.txt +++ b/src/external/TLemRunHeader/CMakeLists.txt @@ -3,9 +3,11 @@ #--- generate necessary dictionaries ------------------------------------------ root_generate_dictionary( TLemRunHeaderDict TLemRunHeader.h LINKDEF TLemRunHeaderLinkDef.h + MODULE TLemRunHeader ) root_generate_dictionary( - TLemStatsDict TLemStats.h LINKDEF TLemStatsLinkDef.h + TLemStatsDict TLemStats.h LINKDEF TLemStatsLinkDef.h + MODULE TLemStats ) #--- create pkg-config info --------------------------------------------------- @@ -44,10 +46,10 @@ install(TARGETS TLemRunHeader DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libTLemRunHeaderDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libTLemRunHeaderDict.rootmap - ${CMAKE_CURRENT_BINARY_DIR}/libTLemStatsDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libTLemStatsDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libTLemRunHeader_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libTLemRunHeader.rootmap + ${CMAKE_CURRENT_BINARY_DIR}/libTLemStats_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libTLemStats.rootmap DESTINATION lib ) diff --git a/src/external/libBNMR/CMakeLists.txt b/src/external/libBNMR/CMakeLists.txt index 520ad368..1f10f260 100644 --- a/src/external/libBNMR/CMakeLists.txt +++ b/src/external/libBNMR/CMakeLists.txt @@ -9,6 +9,7 @@ root_generate_dictionary( -I${MUSRFIT_INC} TBNMR.h LINKDEF TBNMRLinkDef.h + MODULE TBNMR ) #--- lib creation ------------------------------------------------------------- @@ -38,8 +39,8 @@ install(TARGETS BNMR DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libTBNMRDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libTBNMRDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libTBNMR_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libTBNMR.rootmap DESTINATION lib ) diff --git a/src/external/libCalcMeanFieldsLEM/CMakeLists.txt b/src/external/libCalcMeanFieldsLEM/CMakeLists.txt index 0916986b..c41b573c 100644 --- a/src/external/libCalcMeanFieldsLEM/CMakeLists.txt +++ b/src/external/libCalcMeanFieldsLEM/CMakeLists.txt @@ -13,6 +13,7 @@ root_generate_dictionary( -I${POFB_INC} TCalcMeanFieldsLEM.h LINKDEF TCalcMeanFieldsLEMLinkDef.h + MODULE TCalcMeanFieldsLEM ) #--- create pkg-config info --------------------------------------------------- @@ -58,8 +59,8 @@ install(TARGETS CalcMeanFieldsLEM DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libTCalcMeanFieldsLEMDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libTCalcMeanFieldsLEMDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libTCalcMeanFieldsLEM_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libTCalcMeanFieldsLEM.rootmap DESTINATION lib ) diff --git a/src/external/libFitPofB/classes/CMakeLists.txt b/src/external/libFitPofB/classes/CMakeLists.txt index 61443e2a..fab6a2c1 100644 --- a/src/external/libFitPofB/classes/CMakeLists.txt +++ b/src/external/libFitPofB/classes/CMakeLists.txt @@ -14,6 +14,7 @@ root_generate_dictionary( -I${CMAKE_CURRENT_SOURCE_DIR}/../include TLondon1D.h LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/TLondon1DLinkDef.h + MODULE TLondon1D ) root_generate_dictionary( TVortexDict @@ -24,6 +25,7 @@ root_generate_dictionary( -I${CMAKE_CURRENT_SOURCE_DIR}/../include TVortex.h LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/TVortexLinkDef.h + MODULE TVortex ) root_generate_dictionary( TSkewedGssDict @@ -34,6 +36,7 @@ root_generate_dictionary( -I${CMAKE_CURRENT_SOURCE_DIR}/../include TSkewedGss.h LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/TSkewedGssLinkDef.h + MODULE TSkewedGss ) #--- create pkg-config info --------------------------------------------------- @@ -99,12 +102,12 @@ install(TARGETS FitPofB DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libTLondon1DDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libTLondon1DDict.rootmap - ${CMAKE_CURRENT_BINARY_DIR}/libTVortexDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libTVortexDict.rootmap - ${CMAKE_CURRENT_BINARY_DIR}/libTSkewedGssDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libTSkewedGssDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libTLondon1D_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libTLondon1D.rootmap + ${CMAKE_CURRENT_BINARY_DIR}/libTVortex_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libTVortex.rootmap + ${CMAKE_CURRENT_BINARY_DIR}/libTSkewedGss_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libTSkewedGss.rootmap DESTINATION lib ) diff --git a/src/external/libGapIntegrals/CMakeLists.txt b/src/external/libGapIntegrals/CMakeLists.txt index 63fb1b05..9611de12 100644 --- a/src/external/libGapIntegrals/CMakeLists.txt +++ b/src/external/libGapIntegrals/CMakeLists.txt @@ -11,6 +11,7 @@ root_generate_dictionary( -I${BMW_TOOLS_INC} TGapIntegrals.h LINKDEF TGapIntegralsLinkDef.h + MODULE TGapIntegrals ) #--- create pkg-config info --------------------------------------------------- @@ -56,8 +57,8 @@ install(TARGETS GapIntegrals DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libTGapIntegralsDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libTGapIntegralsDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libTGapIntegrals_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libTGapIntegrals.rootmap DESTINATION lib ) diff --git a/src/external/libLFRelaxation/CMakeLists.txt b/src/external/libLFRelaxation/CMakeLists.txt index 2d7bf19f..59f8bd5f 100644 --- a/src/external/libLFRelaxation/CMakeLists.txt +++ b/src/external/libLFRelaxation/CMakeLists.txt @@ -11,6 +11,7 @@ root_generate_dictionary( -I${BMW_TOOLS_INC} TLFRelaxation.h LINKDEF TLFRelaxationLinkDef.h + MODULE TLFRelaxation ) #--- create pkg-config info --------------------------------------------------- @@ -65,8 +66,8 @@ install(TARGETS LFRelaxation DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libTLFRelaxationDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libTLFRelaxationDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libTLFRelaxation_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libTLFRelaxation.rootmap DESTINATION lib ) diff --git a/src/external/libPhotoMeissner/classes/CMakeLists.txt b/src/external/libPhotoMeissner/classes/CMakeLists.txt index 99fecd68..e52f90b0 100644 --- a/src/external/libPhotoMeissner/classes/CMakeLists.txt +++ b/src/external/libPhotoMeissner/classes/CMakeLists.txt @@ -10,6 +10,7 @@ root_generate_dictionary( -I${CMAKE_CURRENT_SOURCE_DIR}/../include PPhotoMeissner.h LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/PPhotoMeissnerLinkDef.h + MODULE PPhotoMeissner ) root_generate_dictionary( PStartupHandler_PMDict @@ -17,6 +18,7 @@ root_generate_dictionary( -I${CMAKE_CURRENT_SOURCE_DIR}/../include PStartupHandler_PM.h LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/PStartupHandler_PMLinkDef.h + MODULE PStartupHandler_PM ) #--- create pkg-config info --------------------------------------------------- @@ -60,10 +62,10 @@ install(TARGETS PPhotoMeissner DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libPPhotoMeissnerDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPPhotoMeissnerDict.rootmap - ${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandler_PMDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandler_PMDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libPPhotoMeissner_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPPhotoMeissner.rootmap + ${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandler_PM_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandler_PM.rootmap DESTINATION lib ) diff --git a/src/external/libSpinValve/classes/CMakeLists.txt b/src/external/libSpinValve/classes/CMakeLists.txt index 94711cd9..09142a42 100644 --- a/src/external/libSpinValve/classes/CMakeLists.txt +++ b/src/external/libSpinValve/classes/CMakeLists.txt @@ -10,12 +10,14 @@ root_generate_dictionary( -I${CMAKE_CURRENT_SOURCE_DIR}/../include PSkewedLorentzian.h LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/PSkewedLorentzianLinkDef.h + MODULE PSkewedLorentzian ) root_generate_dictionary( PStartupHandler_SVDict -I${CMAKE_CURRENT_SOURCE_DIR}/../include PStartupHandler_SV.h LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/../include/PStartupHandler_SVLinkDef.h + MODULE PStartupHandler_SV ) #--- create pkg-config info --------------------------------------------------- @@ -57,10 +59,10 @@ install(TARGETS PSpinValve DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libPSkewedLorentzianDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPSkewedLorentzianDict.rootmap - ${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandler_SVDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandler_SVDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libPSkewedLorentzian_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPSkewedLorentzian.rootmap + ${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandler_SV_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPStartupHandler_SV.rootmap DESTINATION lib ) diff --git a/src/external/libZFRelaxation/CMakeLists.txt b/src/external/libZFRelaxation/CMakeLists.txt index 8dfbcbcd..8beaa49e 100644 --- a/src/external/libZFRelaxation/CMakeLists.txt +++ b/src/external/libZFRelaxation/CMakeLists.txt @@ -11,6 +11,7 @@ root_generate_dictionary( -I${BMW_TOOLS_INC} ZFRelaxation.h LINKDEF ZFRelaxationLinkDef.h + MODULE ZFRelaxation ) #--- create pkg-config info --------------------------------------------------- @@ -63,8 +64,8 @@ install(TARGETS ZFRelaxation DESTINATION lib) #--- install root pcm's and rootmaps ------------------------------------------ install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/libZFRelaxationDict_rdict.pcm - ${CMAKE_CURRENT_BINARY_DIR}/libZFRelaxationDict.rootmap + FILES ${CMAKE_CURRENT_BINARY_DIR}/libZFRelaxation_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libZFRelaxation.rootmap DESTINATION lib ) diff --git a/src/musredit_qt5/mupp/plotter/CMakeLists.txt b/src/musredit_qt5/mupp/plotter/CMakeLists.txt index a6492053..6f6cf7d7 100644 --- a/src/musredit_qt5/mupp/plotter/CMakeLists.txt +++ b/src/musredit_qt5/mupp/plotter/CMakeLists.txt @@ -32,6 +32,7 @@ root_generate_dictionary( -I${CMAKE_CURRENT_SOURCE_DIR}/.. PMuppCanvas.h LINKDEF PMuppCanvasLinkDef.h + MODULE PMuppCanvas ) root_generate_dictionary( PMuppStartupHandlerDict @@ -39,6 +40,7 @@ root_generate_dictionary( -I${CMAKE_CURRENT_SOURCE_DIR}/.. PMuppStartupHandler.h LINKDEF PMuppStartupHandlerLinkDef.h + MODULE PMuppStartupHandler ) #--- define all the dictonary cxx ---------------------------------------------