Merge branch 'develop' into release/Version-4.46

fbergmann · fbergmann · commit 274c5e1c85a4 · 2025-05-15T14:39:35.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,7 +28,7 @@
 ###############################################################################
 
 # we need at least cmake 2.8 for the FindLAPACK functions
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/ChooseQtVersion.cmake b/ChooseQtVersion.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - 2023 by Pedro Mendes, Rector and Visitors of the 
+# Copyright (C) 2019 - 2025 by Pedro Mendes, Rector and Visitors of the 
 # University of Virginia, University of Heidelberg, and University 
 # of Connecticut School of Medicine. 
 # All rights reserved. 
@@ -8,7 +8,7 @@
 # of Connecticut School of Medicine. 
 # All rights reserved. 
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 set(SELECT_QT "Any" CACHE STRING "The prefered Qt version one of: Qt6, Qt5, Qt4 or Any" )
 if (DEFINED SELECT_QT)
diff --git a/copasi/CMakeLists.txt b/copasi/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - 2024 by Pedro Mendes, Rector and Visitors of the 
+# Copyright (C) 2019 - 2025 by Pedro Mendes, Rector and Visitors of the 
 # University of Virginia, University of Heidelberg, and University 
 # of Connecticut School of Medicine. 
 # All rights reserved. 
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/CopasiSBW/CMakeLists.txt b/copasi/CopasiSBW/CMakeLists.txt
@@ -13,7 +13,7 @@
 # of Manchester. 
 # All rights reserved. 
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if (SBW_FOUND)
 
diff --git a/copasi/CopasiUI/CMakeLists.txt b/copasi/CopasiUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - 2024 by Pedro Mendes, Rector and Visitors of the 
+# Copyright (C) 2019 - 2025 by Pedro Mendes, Rector and Visitors of the 
 # University of Virginia, University of Heidelberg, and University 
 # of Connecticut School of Medicine. 
 # All rights reserved. 
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/ViewCurrentUI/CMakeLists.txt b/copasi/ViewCurrentUI/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 project (ViewCurrentUI)
 
 if (NOT BUILD_GUI)
diff --git a/copasi/bindings/CMakeLists.txt b/copasi/bindings/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - 2021 by Pedro Mendes, Rector and Visitors of the 
+# Copyright (C) 2019 - 2025 by Pedro Mendes, Rector and Visitors of the 
 # University of Virginia, University of Heidelberg, and University 
 # of Connecticut School of Medicine. 
 # All rights reserved. 
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/CMakeLists.txt b/copasi/bindings/cpp_examples/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/assignParameterSet/CMakeLists.txt b/copasi/bindings/cpp_examples/assignParameterSet/CMakeLists.txt
@@ -22,7 +22,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/calculateSolutionStatistic/CMakeLists.txt b/copasi/bindings/cpp_examples/calculateSolutionStatistic/CMakeLists.txt
@@ -22,7 +22,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/changeValues/CMakeLists.txt b/copasi/bindings/cpp_examples/changeValues/CMakeLists.txt
@@ -17,7 +17,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/example1/CMakeLists.txt b/copasi/bindings/cpp_examples/example1/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/example10/CMakeLists.txt b/copasi/bindings/cpp_examples/example10/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - 2022 by Pedro Mendes, Rector and Visitors of the 
+# Copyright (C) 2019 - 2025 by Pedro Mendes, Rector and Visitors of the 
 # University of Virginia, University of Heidelberg, and University 
 # of Connecticut School of Medicine. 
 # All rights reserved. 
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/example2/CMakeLists.txt b/copasi/bindings/cpp_examples/example2/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/example3/CMakeLists.txt b/copasi/bindings/cpp_examples/example3/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/example4/CMakeLists.txt b/copasi/bindings/cpp_examples/example4/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/example5/CMakeLists.txt b/copasi/bindings/cpp_examples/example5/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/example6/CMakeLists.txt b/copasi/bindings/cpp_examples/example6/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/example7/CMakeLists.txt b/copasi/bindings/cpp_examples/example7/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/example8/CMakeLists.txt b/copasi/bindings/cpp_examples/example8/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/example9/CMakeLists.txt b/copasi/bindings/cpp_examples/example9/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/exportSedML/CMakeLists.txt b/copasi/bindings/cpp_examples/exportSedML/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/printAffectedExperiments/CMakeLists.txt b/copasi/bindings/cpp_examples/printAffectedExperiments/CMakeLists.txt
@@ -22,7 +22,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/printFluxModes/CMakeLists.txt b/copasi/bindings/cpp_examples/printFluxModes/CMakeLists.txt
@@ -22,7 +22,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/renameActiveReport/CMakeLists.txt b/copasi/bindings/cpp_examples/renameActiveReport/CMakeLists.txt
@@ -22,7 +22,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/renderLayout/CMakeLists.txt b/copasi/bindings/cpp_examples/renderLayout/CMakeLists.txt
@@ -25,7 +25,7 @@
 # only create this example if we build the gui
 if (BUILD_GUI)
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0020)
   cmake_policy(SET CMP0020 NEW)
diff --git a/copasi/bindings/cpp_examples/runScan/CMakeLists.txt b/copasi/bindings/cpp_examples/runScan/CMakeLists.txt
@@ -17,7 +17,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/bindings/cpp_examples/runSedML/CMakeLists.txt b/copasi/bindings/cpp_examples/runSedML/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/copasi/compareExpressions/stresstest/CMakeLists.txt b/copasi/compareExpressions/stresstest/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 project (compareExpressions-stresstest)
 
 include_directories(
diff --git a/copasi/compareExpressions/unittests/CMakeLists.txt b/copasi/compareExpressions/unittests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - 2025 by Pedro Mendes, Rector and Visitors of the 
+# Copyright (C) 2019 - 2021 by Pedro Mendes, Rector and Visitors of the 
 # University of Virginia, University of Heidelberg, and University 
 # of Connecticut School of Medicine. 
 # All rights reserved. 
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 project (compareExpressions-unittests)
 
 include_directories(
diff --git a/copasi/sbml/unittests/CMakeLists.txt b/copasi/sbml/unittests/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 project (sbml-unittests)
 
 include_directories(
diff --git a/copasi/sedml/CMakeLists.txt b/copasi/sedml/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 - 2025 by Pedro Mendes, Rector and Visitors of the 
+# Copyright (C) 2019 - 2021 by Pedro Mendes, Rector and Visitors of the 
 # University of Virginia, University of Heidelberg, and University 
 # of Connecticut School of Medicine. 
 # All rights reserved. 
@@ -26,7 +26,7 @@
 #
 ###############################################################################
 
-#cmake_minimum_required (VERSION 2.8.12...3.19.1)
+#cmake_minimum_required(VERSION 2.8...3.19)
 
 
 file(GLOB HEADERS_SEDML sedml/*.h)
diff --git a/franks_testsuite/CMakeLists.txt b/franks_testsuite/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/mca_test_wrapper/CMakeLists.txt b/mca_test_wrapper/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 project (mca_test_wrapper)
 
 
diff --git a/sbml-testsuite/CMakeLists.txt b/sbml-testsuite/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
diff --git a/semantic-test-suite/CMakeLists.txt b/semantic-test-suite/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 project (semantic-test-suite)
 
 set(SOURCES ${SOURCES} copasi_wrapper.cpp)
diff --git a/steady_state_test_wrapper/CMakeLists.txt b/steady_state_test_wrapper/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 project (steady_state_test_wrapper)
 
 set(SOURCES ${SOURCES} copasi_wrapper.cpp)
diff --git a/stochastic-testsuite/CMakeLists.txt b/stochastic-testsuite/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 ###############################################################################
 
-cmake_minimum_required (VERSION 2.8.12...3.19.1)
+cmake_minimum_required(VERSION 2.8...3.19)
 
 if(POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`#`
`28`	`28`	`###############################################################################`
`29`	`29`
`30`		`-cmake_minimum_required (VERSION 2.8.12...3.19.1)`
	`30`	`+cmake_minimum_required(VERSION 2.8...3.19)`
`31`	`31`	`project (ViewCurrentUI)`
`32`	`32`
`33`	`33`	`if (NOT BUILD_GUI)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`#`
`23`	`23`	`###############################################################################`
`24`	`24`
`25`		`-cmake_minimum_required (VERSION 2.8.12...3.19.1)`
	`25`	`+cmake_minimum_required(VERSION 2.8...3.19)`
`26`	`26`
`27`	`27`	`if(POLICY CMP0048)`
`28`	`28`	`cmake_policy(SET CMP0048 NEW)`