Sebastien Jodogne pushed to branch master at Debian Med / orthanc-postgresql
Commits: b73d8fc3 by jodogne-guest at 2025-09-01T12:18:05+02:00 fix FTBFS with recent versions of CMake - - - - - 76d0d196 by jodogne-guest at 2025-09-01T12:23:16+02:00 Upload to unstable - - - - - 3 changed files: - debian/changelog - + debian/patches/cmake - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +orthanc-postgresql (5.0+dfsg-5) unstable; urgency=medium + + * Fix FTBFS with recent versions of CMake (Closes: #1113375) + + -- Sebastien Jodogne <[email protected]> Mon, 01 Sep 2025 12:17:15 +0200 + orthanc-postgresql (5.0+dfsg-4) unstable; urgency=medium * Fix FTBFS with boost 1.88 (Closes: #1110760) ===================================== debian/patches/cmake ===================================== @@ -0,0 +1,44 @@ +Description: Fix FTBFS with recent versions of CMake +Author: Sebastien Jodogne <[email protected]> +Forwarded: https://orthanc.uclouvain.be/hg/orthanc-databases/rev/3d1faa34233f +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: OrthancPostgreSQL-5.0/PostgreSQL/CMakeLists.txt +=================================================================== +--- OrthancPostgreSQL-5.0.orig/PostgreSQL/CMakeLists.txt ++++ OrthancPostgreSQL-5.0/PostgreSQL/CMakeLists.txt +@@ -18,7 +18,7 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 2.8...4.0) + project(OrthancPostgreSQL) + + set(ORTHANC_PLUGIN_VERSION "5.0") +Index: OrthancPostgreSQL-5.0/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake +=================================================================== +--- OrthancPostgreSQL-5.0.orig/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake ++++ OrthancPostgreSQL-5.0/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake +@@ -475,11 +475,19 @@ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "s + + include(CheckIncludeFile) + include(CheckIncludeFileCXX) +- include(FindPythonInterp) ++ ++ if(CMAKE_VERSION VERSION_GREATER "3.11") ++ find_package(Python REQUIRED COMPONENTS Interpreter) ++ set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) ++ else() ++ include(FindPythonInterp) ++ find_package(PythonInterp REQUIRED) ++ endif() ++ + include(${CMAKE_CURRENT_LIST_DIR}/Compiler.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/DownloadPackage.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/AutoGeneratedCode.cmake) +- set(EMBED_RESOURCES_PYTHON ${CMAKE_CURRENT_LIST_DIR}/EmbedResources.py) ++ set(EMBED_RESOURCES_PYTHON ${CMAKE_CURRENT_LIST_DIR}/../EmbedResources.py) + + if (ORTHANC_FRAMEWORK_USE_SHARED) + list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix) ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ boost +cmake postgresql View it on GitLab: https://salsa.debian.org/med-team/orthanc-postgresql/-/compare/f03f291a9de04ca9488b3774c98d4536b78d7555...76d0d1961144d94a01fe2bb55997669466dbfec2 -- View it on GitLab: https://salsa.debian.org/med-team/orthanc-postgresql/-/compare/f03f291a9de04ca9488b3774c98d4536b78d7555...76d0d1961144d94a01fe2bb55997669466dbfec2 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
