Andreas Tille pushed to branch master at Debian Med / mapsembler2
Commits: 191e2ff5 by Andreas Tille at 2026-04-28T14:03:39+02:00 Fix build with CMake 4 Closes: #1125550 - - - - - 3 changed files: - debian/changelog - + debian/patches/cmake4.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +mapsembler2 (2.2.4+dfsg1-6) UNRELEASED; urgency=medium + + * Fix build with CMake 4 + Closes: #1125550 + + -- Andreas Tille <[email protected]> Tue, 28 Apr 2026 11:38:27 +0200 + mapsembler2 (2.2.4+dfsg1-5) unstable; urgency=medium * Fix build using CMake 4 ===================================== debian/patches/cmake4.patch ===================================== @@ -0,0 +1,77 @@ +Author: Andreas Tille <[email protected]> +Last-Update: 2026-04-28 +Bug-Debian: http://bugs.debian.org/1125550 +Description: Fix build with CMake 4 + +--- a/mapsembler2_extremities/CMakeLists.txt ++++ b/mapsembler2_extremities/CMakeLists.txt +@@ -1,6 +1,6 @@ + project(mapsembler2_extremities) + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + + + ################################################################################ +--- a/mapsembler2_extremities/thirdparty/gatb-core/CMakeLists.txt ++++ b/mapsembler2_extremities/thirdparty/gatb-core/CMakeLists.txt +@@ -1,7 +1,7 @@ + project(gatb-core) + + # We set the required version +-cmake_minimum_required (VERSION 2.6) ++cmake_minimum_required (VERSION 3.5) + + ################################################################################ + # The version number. +@@ -274,4 +274,4 @@ SET (CPACK_SOURCE_IGNORE_FILES + IF (NOT DEFINED GATB_CORE_INSTALL_EXCLUDE) + # We include the module and get all the delivery targets + include (Delivery) +-ENDIF () +\ No newline at end of file ++ENDIF () +--- a/mapsembler2_extremities/thirdparty/gatb-core/scripts/NewProject/CMakeLists.txt ++++ b/mapsembler2_extremities/thirdparty/gatb-core/scripts/NewProject/CMakeLists.txt +@@ -1,6 +1,6 @@ + project(XXX) + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + + ################################################################################ + # Shortcuts +--- a/mapsembler2_extremities/thirdparty/gatb-core/thirdparty/emphf/CMakeLists.txt ++++ b/mapsembler2_extremities/thirdparty/gatb-core/thirdparty/emphf/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.5) + project(EMPHF) + + if(NOT CMAKE_BUILD_TYPE) +--- a/thirdparty/zlib/CMakeLists.txt ++++ b/thirdparty/zlib/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.4.4) ++cmake_minimum_required(VERSION 3.5) + set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) + + project(zlib C) +--- a/mapsembler2_extremities/cmake/FindTR1.cmake ++++ b/mapsembler2_extremities/cmake/FindTR1.cmake +@@ -7,7 +7,7 @@ + # SHARED_PTR_USE_MEMORY -- #include <memory> + # We need to have at least this version to support the VERSION_LESS argument to 'if' (2.6.2) and unset (2.6.3) + cmake_policy(PUSH) +-cmake_minimum_required(VERSION 2.6.3) ++cmake_minimum_required(VERSION 3.5) + cmake_policy(POP) + # --------------------------------------------------------------------------- + # std::tr1::shared_ptr<T> +@@ -70,4 +70,4 @@ if (UNORDERED_MAP_USE_UNORDERED_MAP) + endif (UNORDERED_MAP_USE_UNORDERED_MAP) + mark_as_advanced (UNORDERED_MAP_FOUND) + mark_as_advanced (UNORDERED_MAP_USE_TR1_UNORDERED_MAP) +-mark_as_advanced (UNORDERED_MAP_USE_UNORDERED_MAP) +\ No newline at end of file ++mark_as_advanced (UNORDERED_MAP_USE_UNORDERED_MAP) ===================================== debian/patches/series ===================================== @@ -10,3 +10,4 @@ gcc10.patch check_memory.patch cross.patch gcc11.patch +cmake4.patch View it on GitLab: https://salsa.debian.org/med-team/mapsembler2/-/commit/191e2ff54cea507a8c340d2fa8d4b6437178bd73 -- View it on GitLab: https://salsa.debian.org/med-team/mapsembler2/-/commit/191e2ff54cea507a8c340d2fa8d4b6437178bd73 You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
