diff options
| author | Chris Marsh <chrismarsh.c2@gmail.com> | 2024-06-04 11:09:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-04 13:09:49 -0400 |
| commit | 8dbf9005f00d28a57df46804900cb9951bf96446 (patch) | |
| tree | 88547f02dc246fa007fb1c51d705749afe510e2c | |
| parent | 0c3da1b4985d4916763eb9e838ee647f5ecae004 (diff) | |
| download | spack-8dbf9005f00d28a57df46804900cb9951bf96446.tar.gz spack-8dbf9005f00d28a57df46804900cb9951bf96446.tar.bz2 spack-8dbf9005f00d28a57df46804900cb9951bf96446.tar.xz spack-8dbf9005f00d28a57df46804900cb9951bf96446.zip | |
proj@7: support the new tiff interface in cmake@3.19 (#44535)
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
| -rw-r--r-- | var/spack/repos/builtin/packages/proj/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/proj/proj-7-cmake-3.29-new-tiff-interface.patch | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index 0c85eb04b0..78a92e8ad6 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -93,6 +93,7 @@ class Proj(CMakePackage, AutotoolsPackage): # to be compatible with this "new" interface # 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-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.1.patch", when="@5.1:5.2") conflicts("cmake@3.19:", when="@:7") diff --git a/var/spack/repos/builtin/packages/proj/proj-7-cmake-3.29-new-tiff-interface.patch b/var/spack/repos/builtin/packages/proj/proj-7-cmake-3.29-new-tiff-interface.patch new file mode 100644 index 0000000000..be0095ffde --- /dev/null +++ b/var/spack/repos/builtin/packages/proj/proj-7-cmake-3.29-new-tiff-interface.patch @@ -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) |