diff --git a/configure.ac b/configure.ac index 8b3cb01c..e52c82c8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_REVISION([m4_esyscmd_s([git describe --always])]) AC_PREREQ(2.63) -AC_INIT([musrfit],[1.2.1],[andreas.suter@psi.ch]) +AC_INIT([musrfit],[1.3.0],[andreas.suter@psi.ch]) AC_CONFIG_AUX_DIR(admin) AC_CANONICAL_HOST #AC_MSG_RESULT([${host} ${host_cpu} ${host_vendor} ${host_os}]) @@ -35,8 +35,8 @@ dnl ----------------------------------------------- #release versioning MUSR_MAJOR_VERSION=1 -MUSR_MINOR_VERSION=2 -MUSR_MICRO_VERSION=1 +MUSR_MINOR_VERSION=3 +MUSR_MICRO_VERSION=0 #release versioning MUSR_ROOT_MAJOR_VERSION=1 @@ -54,7 +54,7 @@ PSIBIN_MINOR_VERSION=1 PSIBIN_MICRO_VERSION=0 #release versioning -MUD_MAJOR_VERSION=0 +MUD_MAJOR_VERSION=1 MUD_MINOR_VERSION=0 MUD_MICRO_VERSION=0 diff --git a/src/classes/CMakeLists.txt b/src/classes/CMakeLists.txt index cfb60d70..ec775c9d 100644 --- a/src/classes/CMakeLists.txt +++ b/src/classes/CMakeLists.txt @@ -34,7 +34,7 @@ set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "\$\{prefix\}") set(libdir "\$\{exec_prefix\}/lib") set(includedir "\$\{prefix\}/include") -set(MUSR_VERSION "1.2.0") +set(MUSR_VERSION "1.3.0") set(MUSR_LIBRARY_NAME "PMusr") configure_file("PMusr.pc.in" "PMusr.pc" @ONLY) set(USERFCN_LIBRARY_NAME "PUserFcnBase") @@ -89,6 +89,16 @@ add_library(PUserFcnBase SHARED PUserFcnBase.cpp PUserFcnBaseDict.cxx ) + +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(PMusr + PROPERTIES + VERSION ${MUSR_VERSION} +) +set_target_properties(PUserFcnBase + PROPERTIES + VERSION ${MUSR_VERSION} +) #--- make sure that the include directory is found ---------------------------- target_include_directories( PUserFcnBase BEFORE PRIVATE $ diff --git a/src/external/BMWtools/CMakeLists.txt b/src/external/BMWtools/CMakeLists.txt index be9cdaa4..a8e9b9cb 100644 --- a/src/external/BMWtools/CMakeLists.txt +++ b/src/external/BMWtools/CMakeLists.txt @@ -29,6 +29,13 @@ add_library(BMWtools SHARED TTrimSPDataHandler.cpp BMWIntegrator.cpp ) + +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(BMWtools + PROPERTIES + VERSION "1.0.0" +) + #--- make sure that the include directory is found ---------------------------- target_include_directories( BMWtools BEFORE PRIVATE diff --git a/src/external/MagProximity/CMakeLists.txt b/src/external/MagProximity/CMakeLists.txt index 6e4fb369..8dff6467 100644 --- a/src/external/MagProximity/CMakeLists.txt +++ b/src/external/MagProximity/CMakeLists.txt @@ -18,8 +18,8 @@ set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "\$\{prefix\}") set(libdir "\$\{exec_prefix\}/lib") set(includedir "\$\{prefix\}/include") -set(PNL_PIPPARDFITTER_VERSION "1.0.0") -set(PNL_PIPPARDFITTER_LIBRARY_NAME "PMagProximityFitter") +set(P_MAG_PROXIMITY_FITTER_VERSION "1.0.0") +set(P_MAG_PROXIMITY_FITTER_LIBRARY_NAME "PMagProximityFitter") configure_file("PMagProximityFitter.pc.in" "PMagProximityFitter.pc" @ONLY) #--- lib creation ------------------------------------------------------------- @@ -38,6 +38,12 @@ target_include_directories( $ ) +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(PMagProximityFitter + PROPERTIES + VERSION ${P_MAG_PROXIMITY_FITTER_VERSION} +) + #--- add library dependencies ------------------------------------------------- target_link_libraries(PMagProximityFitter ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase) diff --git a/src/external/MuSR_software/Class_MuSR_PSI/CMakeLists.txt b/src/external/MuSR_software/Class_MuSR_PSI/CMakeLists.txt index 0c5d59d4..6822f600 100644 --- a/src/external/MuSR_software/Class_MuSR_PSI/CMakeLists.txt +++ b/src/external/MuSR_software/Class_MuSR_PSI/CMakeLists.txt @@ -21,6 +21,12 @@ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") #--- lib creation ------------------------------------------------------------- add_library(Class_MuSR_PSI SHARED MuSR_td_PSI_bin.cpp) +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(Class_MuSR_PSI + PROPERTIES + VERSION ${PSIBIN_VERSION} +) + #--- install Class_MuSR_PSI solib --------------------------------------------- install(TARGETS Class_MuSR_PSI DESTINATION lib) diff --git a/src/external/MusrRoot/CMakeLists.txt b/src/external/MusrRoot/CMakeLists.txt index 5fc03006..91e1c52a 100644 --- a/src/external/MusrRoot/CMakeLists.txt +++ b/src/external/MusrRoot/CMakeLists.txt @@ -24,6 +24,12 @@ target_include_directories( TMusrRunHeader BEFORE PRIVATE $ ) +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(TMusrRunHeader + PROPERTIES + VERSION ${MUSR_ROOT_VERSION} +) + #--- add library dependencies ------------------------------------------------- target_link_libraries(TMusrRunHeader ${ROOT_LIBRARIES}) diff --git a/src/external/Nonlocal/CMakeLists.txt b/src/external/Nonlocal/CMakeLists.txt index 8fd64c28..815615f4 100644 --- a/src/external/Nonlocal/CMakeLists.txt +++ b/src/external/Nonlocal/CMakeLists.txt @@ -39,6 +39,12 @@ target_include_directories( $ ) +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(PNL_PippardFitter + PROPERTIES + VERSION ${PNL_PIPPARDFITTER_VERSION} +) + #--- add library dependencies ------------------------------------------------- target_link_libraries(PNL_PippardFitter ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase) diff --git a/src/external/TLemRunHeader/CMakeLists.txt b/src/external/TLemRunHeader/CMakeLists.txt index f4e95672..d3bfb436 100644 --- a/src/external/TLemRunHeader/CMakeLists.txt +++ b/src/external/TLemRunHeader/CMakeLists.txt @@ -24,6 +24,13 @@ add_library(TLemRunHeader SHARED TLemStats.cxx TLemStatsDict.cxx ) + +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(TLemRunHeader + PROPERTIES + VERSION ${LEM_VERSION} +) + #--- make sure that the include directory is found ---------------------------- target_include_directories( TLemRunHeader BEFORE PRIVATE $ diff --git a/src/external/libCalcMeanFieldsLEM/CMakeLists.txt b/src/external/libCalcMeanFieldsLEM/CMakeLists.txt index bfa48ca9..0916986b 100644 --- a/src/external/libCalcMeanFieldsLEM/CMakeLists.txt +++ b/src/external/libCalcMeanFieldsLEM/CMakeLists.txt @@ -31,6 +31,13 @@ add_library(CalcMeanFieldsLEM SHARED TCalcMeanFieldsLEM.cpp TCalcMeanFieldsLEMDict.cxx ) + +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(CalcMeanFieldsLEM + PROPERTIES + VERSION "1.0.0" +) + #--- make sure that the include directory is found ---------------------------- target_include_directories( CalcMeanFieldsLEM BEFORE PRIVATE diff --git a/src/external/libCuba/src/CMakeLists.txt b/src/external/libCuba/src/CMakeLists.txt index f6fd8f8b..0e9fe068 100644 --- a/src/external/libCuba/src/CMakeLists.txt +++ b/src/external/libCuba/src/CMakeLists.txt @@ -24,6 +24,12 @@ add_library(cuba SHARED $ ) +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(cuba + PROPERTIES + VERSION ${CUBA_VERSION} +) + #--- install cuba solib ------------------------------------------------------- install(TARGETS cuba DESTINATION lib) diff --git a/src/external/libFitPofB/classes/CMakeLists.txt b/src/external/libFitPofB/classes/CMakeLists.txt index b02abcf6..c3187dea 100644 --- a/src/external/libFitPofB/classes/CMakeLists.txt +++ b/src/external/libFitPofB/classes/CMakeLists.txt @@ -61,6 +61,13 @@ add_library(FitPofB SHARED TSkewedGss.cpp TSkewedGssDict.cxx ) + +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(FitPofB + PROPERTIES + VERSION "1.0.0" +) + #--- make sure that the include directory is found ---------------------------- target_include_directories( FitPofB BEFORE PRIVATE diff --git a/src/external/libGapIntegrals/CMakeLists.txt b/src/external/libGapIntegrals/CMakeLists.txt index ea67b173..9009e8ea 100644 --- a/src/external/libGapIntegrals/CMakeLists.txt +++ b/src/external/libGapIntegrals/CMakeLists.txt @@ -29,6 +29,13 @@ add_library(GapIntegrals SHARED TGapIntegrals.cpp TGapIntegralsDict.cxx ) + +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(GapIntegrals + PROPERTIES + VERSION "1.0.0" +) + #--- make sure that the include directory is found ---------------------------- target_include_directories( GapIntegrals BEFORE PRIVATE diff --git a/src/external/libLFRelaxation/CMakeLists.txt b/src/external/libLFRelaxation/CMakeLists.txt index 3fc4a3c4..ece9198a 100644 --- a/src/external/libLFRelaxation/CMakeLists.txt +++ b/src/external/libLFRelaxation/CMakeLists.txt @@ -29,6 +29,13 @@ add_library(LFRelaxation SHARED TLFRelaxation.cpp TLFRelaxationDict.cxx ) + +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(LFRelaxation + PROPERTIES + VERSION "1.0.0" +) + #--- make sure that the include directory is found ---------------------------- target_include_directories( LFRelaxation BEFORE PRIVATE diff --git a/src/external/libPhotoMeissner/classes/CMakeLists.txt b/src/external/libPhotoMeissner/classes/CMakeLists.txt index f1d9826f..f376155d 100644 --- a/src/external/libPhotoMeissner/classes/CMakeLists.txt +++ b/src/external/libPhotoMeissner/classes/CMakeLists.txt @@ -34,6 +34,13 @@ add_library(PPhotoMeissner SHARED PStartupHandler_PM.cpp PStartupHandler_PMDict.cxx ) + +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(PPhotoMeissner + PROPERTIES + VERSION ${P_PHOTO_MEISSNER_VERSION} +) + #--- make sure that the include directory is found ---------------------------- target_include_directories( PPhotoMeissner BEFORE PRIVATE diff --git a/src/external/libSpinValve/classes/CMakeLists.txt b/src/external/libSpinValve/classes/CMakeLists.txt index 39161b82..94711cd9 100644 --- a/src/external/libSpinValve/classes/CMakeLists.txt +++ b/src/external/libSpinValve/classes/CMakeLists.txt @@ -34,6 +34,13 @@ add_library(PSpinValve SHARED PStartupHandler_SV.cpp PStartupHandler_SVDict.cxx ) + +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(PSpinValve + PROPERTIES + VERSION ${P_SPIN_VALVE_VERSION} +) + #--- make sure that the include directory is found ---------------------------- target_include_directories( PSpinValve BEFORE PRIVATE diff --git a/src/external/libZFRelaxation/CMakeLists.txt b/src/external/libZFRelaxation/CMakeLists.txt index 30b067ad..f97d0e7f 100644 --- a/src/external/libZFRelaxation/CMakeLists.txt +++ b/src/external/libZFRelaxation/CMakeLists.txt @@ -29,6 +29,13 @@ add_library(ZFRelaxation SHARED ZFRelaxation.cpp ZFRelaxationDict.cxx ) + +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(ZFRelaxation + PROPERTIES + VERSION "1.0.0" +) + #--- make sure that the include directory is found ---------------------------- target_include_directories( ZFRelaxation BEFORE PRIVATE diff --git a/src/external/mud/src/CMakeLists.txt b/src/external/mud/src/CMakeLists.txt index 572c6754..8dda07a2 100644 --- a/src/external/mud/src/CMakeLists.txt +++ b/src/external/mud/src/CMakeLists.txt @@ -20,6 +20,12 @@ add_library(mud SHARED mud_tri_ti.c ) +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(mud + PROPERTIES + VERSION ${MUD_VERSION} +) + #--- install mud solib -------------------------------------------------------- install(TARGETS mud DESTINATION lib) diff --git a/src/external/nexus/CMakeLists.txt b/src/external/nexus/CMakeLists.txt index 69023fbd..592576ab 100644 --- a/src/external/nexus/CMakeLists.txt +++ b/src/external/nexus/CMakeLists.txt @@ -15,6 +15,13 @@ configure_file("PNeXus.pc.in" "PNeXus.pc" @ONLY) add_library(PNeXus SHARED PNeXus.cpp ) + +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(PNeXus + PROPERTIES + VERSION ${PNEXUS_VERSION} +) + #--- make sure that the include directory is found ---------------------------- target_include_directories( PNeXus BEFORE PRIVATE $