[med-svn] [Git][med-team/minc-tools][master] 5 commits: Building with CMake 4.2

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Med / minc-tools


Commits:
c4993a01 by Pierre Gruet at 2026-02-22T12:43:34+01:00
Building with CMake 4.2

- - - - -
304aff89 by Pierre Gruet at 2026-02-22T12:43:46+01:00
Removing Priority: optional, which is default

- - - - -
acd2fc81 by Pierre Gruet at 2026-02-22T12:43:54+01:00
Raising Standards version to 4.7.3

- - - - -
28c5b505 by Pierre Gruet at 2026-02-22T12:44:48+01:00
Updating changelog

- - - - -
affce6fa by Pierre Gruet at 2026-02-22T12:44:58+01:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/cmake_4.2.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+minc-tools (2.3.00+dfsg-16) unstable; urgency=medium
+
+  * Team upload.
+  * Building with CMake 4.2 (Closes: #1125553)
+  * Raising Standards version to 4.7.3:
+    - Removing Priority: optional, which is default
+
+ -- Pierre Gruet <pgt at debian.org>  Sun, 22 Feb 2026 12:44:50 +0100
+
 minc-tools (2.3.00+dfsg-15) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -1,11 +1,10 @@
 Source: minc-tools
-Standards-Version: 4.7.2
+Standards-Version: 4.7.3
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders:
  Steve M. Robbins <smr at debian.org>,
  Andreas Tille <tille at debian.org>,
 Section: science
-Priority: optional
 Build-Depends:
  debhelper-compat (= 13),
  cmake,


=====================================
debian/patches/cmake_4.2.patch
=====================================
@@ -0,0 +1,69 @@
+Description: In CMake 4.2, it is no more possible to get the LOCATION property.
+ Instead, we indicate the path to the built executables.
+Author: Pierre Gruet <pgt at debian.orr>
+Bug-Debian: https://bugs.debian.org/1125553
+Forwarded: no
+Last-Update: 2026-02-22
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,13 +17,7 @@
+ ENABLE_TESTING()
+ INCLUDE(CTest)
+ 
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+-
+-IF(COMMAND CMAKE_POLICY)
+-  IF(POLICY CMP0026)
+-    CMAKE_POLICY(SET CMP0026 OLD) # NEEDED in testing to read location of target
+-  ENDIF(POLICY CMP0026)
+-ENDIF(COMMAND CMAKE_POLICY)
++CMAKE_MINIMUM_REQUIRED(VERSION 4.2)
+ 
+ IF(MINC_TOOLKIT_BUILD)
+   SET(MINC_TOOLS_EXTERNALLY_CONFIGURED ON)
+--- a/Testing/CMakeLists.txt
++++ b/Testing/CMakeLists.txt
+@@ -2,19 +2,19 @@
+ # 
+ 
+ # Get path to mincstats binary.
+-GET_PROPERTY(mincstats_bin TARGET mincstats PROPERTY LOCATION)
++SET(mincstats_bin "${CMAKE_BINARY_DIR}/progs/mincstats")
+ 
+ # Get path to mincinfo binary.
+-GET_PROPERTY(mincinfo_bin TARGET mincinfo PROPERTY LOCATION)
++SET(mincinfo_bin "${CMAKE_BINARY_DIR}/progs/mincinfo")
+ 
+ # Get path to mincextract binary
+-GET_PROPERTY(mincextract_bin TARGET mincextract PROPERTY LOCATION)
++SET(mincextract_bin "${CMAKE_BINARY_DIR}/progs/mincextract")
+ 
+ # Get path to mincaverage binary.
+-GET_PROPERTY(mincaverage_bin TARGET mincaverage PROPERTY LOCATION)
++SET(mincaverage_bin "${CMAKE_BINARY_DIR}/progs/mincaverage")
+ 
+ # Get path to mincaverage binary.
+-GET_PROPERTY(mincresample_bin TARGET mincresample PROPERTY LOCATION)
++SET(mincresample_bin "${CMAKE_BINARY_DIR}/progs/mincresample")
+ 
+ # Copy files used by minccalc-test and other tests.
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/test-zero.mnc" "${CMAKE_CURRENT_BINARY_DIR}/test-zero.mnc" COPYONLY)
+@@ -42,7 +42,7 @@
+     PROPERTIES ENVIRONMENT "MINCAVERAGE_BIN=${mincaverage_bin};MINCSTATS_BIN=${mincstats_bin}")
+ 
+ # Get path to the binary.
+-GET_PROPERTY(minccalc_bin TARGET minccalc PROPERTY LOCATION)
++SET(minccalc_bin "${CMAKE_BINARY_DIR}/progs/minccalc")
+ 
+ # Add the test.
+ ADD_TEST(minccalc-test ${CMAKE_CURRENT_SOURCE_DIR}/minccalc-test.sh)
+@@ -59,7 +59,7 @@
+     PROPERTIES ENVIRONMENT "MINCRESAMPLE_BIN=${mincresample_bin};MINCSTATS_BIN=${mincstats_bin}")
+ 
+ # Get path to mincaverage binary.
+-GET_PROPERTY(mincreshape_bin TARGET mincreshape PROPERTY LOCATION)
++SET(mincreshape_bin "${CMAKE_BINARY_DIR}/progs/mincreshape")
+ 
+ ADD_TEST(mincreshape-test ${CMAKE_CURRENT_SOURCE_DIR}/mincreshape-test.pl)
+ 


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@ fix_manpages.patch
 fix-gcc10-build.patch
 mnc2nii-use-size-t.patch
 netcdf-4.9.3.patch
+cmake_4.2.patch


=====================================
debian/rules
=====================================
@@ -26,7 +26,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(CMAKE_FLAGS) -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+	dh_auto_configure -- $(CMAKE_FLAGS)
 
 override_dh_install:
 	cd debian/minc-tools && mkdir -p usr/share && mv usr/man usr/share



View it on GitLab: https://salsa.debian.org/med-team/minc-tools/-/compare/45b7d79b3a39982b3deb57942afea7acb7bd86bb...affce6faba8b43f9819296917cc6026cce9eb208

-- 
View it on GitLab: https://salsa.debian.org/med-team/minc-tools/-/compare/45b7d79b3a39982b3deb57942afea7acb7bd86bb...affce6faba8b43f9819296917cc6026cce9eb208
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260222/1aaf4e24/attachment-0001.htm>