From 84bb6e3a72144bc60b4a788479614bf04ffbcbf0 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Fri, 16 Jan 2026 09:24:09 +0100 Subject: [PATCH] spirit classic/qi -> x3. Increase musrfit and library version to 1.9.10/1.7.0. --- CMakeLists.txt | 2 +- ChangeLog | 5 +++++ src/classes/CMakeLists.txt | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a07939f1b..c8d5bd8ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # - musrfit cmake_minimum_required(VERSION 3.17) -project(musrfit VERSION 1.9.9 LANGUAGES C CXX) +project(musrfit VERSION 1.9.10 LANGUAGES C CXX) #--- musrfit specific options ------------------------------------------------- option(nexus "build optional NeXus support. Needed for ISIS" OFF) diff --git a/ChangeLog b/ChangeLog index 036d3694a..03dd8f9ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,11 @@ or https://bitbucket.org/muonspin/musrfit +Release of V1.9.10, 2026/01/16 +============================== + +function handling lifted from boost/spirit classic/qi to x3 + Release of V1.9.9, 2025/06/08 ============================= diff --git a/src/classes/CMakeLists.txt b/src/classes/CMakeLists.txt index 6fe5bdfa6..822b9219b 100644 --- a/src/classes/CMakeLists.txt +++ b/src/classes/CMakeLists.txt @@ -82,7 +82,7 @@ set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "\$\{prefix\}") set(libdir "\$\{exec_prefix\}/lib") set(includedir "\$\{prefix\}/include") -set(MUSR_VERSION "1.6.0") +set(MUSR_VERSION "1.7.0") set(MUSR_LIBRARY_NAME "PMusr") configure_file("PMusr.pc.in" "PMusr.pc" @ONLY) set(USERFCN_LIBRARY_NAME "PUserFcnBase")