zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proj@7: support the new tiff interface in cmake@3.19 (#44535)

Browse Source 
Add patch for proj@7 to support the new tiff interface shipped in cmake@3.19: This compliments the existing patch for @8  in #43780
This commit is contained in:
Chris Marsh 2024-06-04 11:09:49 -06:00 committed by GitHub
parent 0c3da1b498
commit 8dbf9005f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
var/spack/repos/builtin/packages/proj/package.py
View File

@ -93,6 +93,7 @@ class Proj(CMakePackage, AutotoolsPackage):
# to be compatible with this "new" interface # to be compatible with this "new" interface
# patch replaces the TIFF_LIBRARY variable (no longer used) with TIFF_LIBRARIES # patch replaces the TIFF_LIBRARY variable (no longer used) with TIFF_LIBRARIES
patch("proj-8.1-cmake-3.29-new-tiff-interface.patch", when="+tiff @8:9.1.0 ^cmake@3.19:") patch("proj-8.1-cmake-3.29-new-tiff-interface.patch", when="+tiff @8:9.1.0 ^cmake@3.19:")
patch("proj-7-cmake-3.29-new-tiff-interface.patch", when="+tiff @7 ^cmake@3.19:")
patch("proj.cmakelists.5.0.patch", when="@5.0") patch("proj.cmakelists.5.0.patch", when="@5.0")
patch("proj.cmakelists.5.1.patch", when="@5.1:5.2") patch("proj.cmakelists.5.1.patch", when="@5.1:5.2")
conflicts("cmake@3.19:", when="@:7") conflicts("cmake@3.19:", when="@:7")

13
var/spack/repos/builtin/packages/proj/proj-7-cmake-3.29-new-tiff-interface.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
index cf30734e5779b102dac3e72ac13962687f6e376e..b2f42c13bc43b6cf5475965c2ce0077daefc47e2 100644
--- a/src/lib_proj.cmake
+++ b/src/lib_proj.cmake
@@ -420,7 +420,7 @@ target_link_libraries(${PROJ_CORE_TARGET} ${SQLITE3_LIBRARY})
if(TIFF_ENABLED)
target_compile_definitions(${PROJ_CORE_TARGET} PRIVATE -DTIFF_ENABLED)
target_include_directories(${PROJ_CORE_TARGET} PRIVATE ${TIFF_INCLUDE_DIR})
- target_link_libraries(${PROJ_CORE_TARGET} ${TIFF_LIBRARY})
+ target_link_libraries(${PROJ_CORE_TARGET} ${TIFF_LIBRARIES})
endif()
if(CURL_ENABLED)