diff --git a/CMakeLists.txt b/CMakeLists.txt index 690dd280..610eeef1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # - musrfit cmake_minimum_required(VERSION 3.17) -project(musrfit VERSION 1.9.1 LANGUAGES C CXX) +project(musrfit VERSION 1.9.2 LANGUAGES C CXX) #--- musrfit specific options ------------------------------------------------- option(nexus "build optional NeXus support. Needed for ISIS" OFF) diff --git a/ChangeLog b/ChangeLog index 8af8b86b..2b59c1fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,11 @@ or https://bitbucket.org/muonspin/musrfit/commits/all +Release of V1.9.2, 2023/10/25 +============================= + +switch over to smart pointers wherever possible. + Release of V1.9.1, 2023/05/16 ============================= diff --git a/src/classes/CMakeLists.txt b/src/classes/CMakeLists.txt index 78e7aeed..a65935df 100644 --- a/src/classes/CMakeLists.txt +++ b/src/classes/CMakeLists.txt @@ -73,7 +73,7 @@ set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "\$\{prefix\}") set(libdir "\$\{exec_prefix\}/lib") set(includedir "\$\{prefix\}/include") -set(MUSR_VERSION "1.3.0") +set(MUSR_VERSION "1.4.0") set(MUSR_LIBRARY_NAME "PMusr") configure_file("PMusr.pc.in" "PMusr.pc" @ONLY) set(USERFCN_LIBRARY_NAME "PUserFcnBase") diff --git a/src/musredit_qt5/mupp/CMakeLists.txt b/src/musredit_qt5/mupp/CMakeLists.txt index 27a556ae..5611e112 100644 --- a/src/musredit_qt5/mupp/CMakeLists.txt +++ b/src/musredit_qt5/mupp/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) #--- define mupp version ------------------------------------------------------ -set(mupp_VERSION 1.0.0) +set(mupp_VERSION 1.1.0) #--- mupp_version.h generation - START ---------------------------------------- configure_file( diff --git a/src/musredit_qt6/mupp/CMakeLists.txt b/src/musredit_qt6/mupp/CMakeLists.txt index 6771a429..c19a7d05 100644 --- a/src/musredit_qt6/mupp/CMakeLists.txt +++ b/src/musredit_qt6/mupp/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) #--- define mupp version ------------------------------------------------------ -set(mupp_VERSION 1.0.0) +set(mupp_VERSION 1.1.0) #--- mupp_version.h generation - START ---------------------------------------- configure_file(