diff --git a/srcpkgs/proj/patches/fix-cmake-deps.patch b/srcpkgs/proj/patches/fix-cmake-deps.patch index 2569f835090..f090104377f 100644 --- a/srcpkgs/proj/patches/fix-cmake-deps.patch +++ b/srcpkgs/proj/patches/fix-cmake-deps.patch @@ -1,9 +1,15 @@ --- a/cmake/project-config.cmake.in +++ b/cmake/project-config.cmake.in -@@ -19,30 +19,6 @@ include(CMakeFindDependencyMacro) - # Cf https://gitlab.kitware.com/cmake/cmake/-/issues/17612 - cmake_policy(PUSH) - cmake_policy(SET CMP0012 NEW) +@@ -13,37 +13,6 @@ endif() + + include(CMakeFindDependencyMacro) + +-# We cannot have a find_dependency() call between cmake_policy(PUSH)/cmake_policy(POP) +-# because find_dependency() issues a return() on failure, which results in +-# imbalanced push/pop +-# Cf https://gitlab.kitware.com/cmake/cmake/-/issues/17612 +-cmake_policy(PUSH) +-cmake_policy(SET CMP0012 NEW) -if("@ENABLE_TIFF@") - set(PROJ_CONFIG_FIND_TIFF_DEP ON) -endif() @@ -28,6 +34,7 @@ - ) - endif() -endif() - +- function(set_variable_from_rel_or_absolute_path var root rel_or_abs_path) if(IS_ABSOLUTE "${rel_or_abs_path}") + set(${var} "${rel_or_abs_path}" PARENT_SCOPE) diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template index 9578c782001..0c5490970a4 100644 --- a/srcpkgs/proj/template +++ b/srcpkgs/proj/template @@ -1,7 +1,7 @@ # Template file for 'proj' pkgname=proj version=9.2.1 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="python3"