git: 8db97e44ba59 - main - science/smoldyn: Fix build with tiff 4.7.0

From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Wed, 09 Oct 2024 19:43:38 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8db97e44ba597bd36097a843cd311e7453e4c987

commit 8db97e44ba597bd36097a843cd311e7453e4c987
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-10-09 19:27:55 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2024-10-09 19:43:26 +0000

    science/smoldyn: Fix build with tiff 4.7.0
    
    Use TIFF:tiff to define the library instead of ${TIFF_LIBRARY} and
    remove custom logic that tried to replace CMake's own.
    
    PR:             281763
    Reviewed by:    yuri
---
 science/smoldyn/files/patch-CMakeLists.txt | 43 ++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/science/smoldyn/files/patch-CMakeLists.txt b/science/smoldyn/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..7900d1252b90
--- /dev/null
+++ b/science/smoldyn/files/patch-CMakeLists.txt
@@ -0,0 +1,43 @@
+--- CMakeLists.txt.orig	2024-02-27 21:40:19 UTC
++++ CMakeLists.txt
+@@ -411,25 +411,25 @@ if (OPTION_USE_LIBTIFF)
+         find_path(TIFF_INCLUDE_DIR tiff.h PATHS ${CMAKE_SOURCE_DIR}/Mac/libtiff/include NO_DEFAULT_PATH)
+         find_library(TIFF_LIBRARY libtiff.a ${CMAKE_SOURCE_DIR}/Mac/libtiff/lib NO_DEFAULT_PATH)
+     else ()
+-        find_package(TIFF)
+-        if(TIFF_LIBRARY)
+-            cmake_path(GET TIFF_LIBRARY PARENT_PATH TIFF_RPATH)
+-            message(STATUS "Libtiff run path: '${TIFF_RPATH}'")
+-            list(APPEND RUN_LIBS ${TIFF_RPATH})
+-        endif()
++        find_package(TIFF REQUIRED)
++#        if(TIFF_LIBRARY)
++#            cmake_path(GET TIFF_LIBRARY PARENT_PATH TIFF_RPATH)
++#            message(STATUS "Libtiff run path: '${TIFF_RPATH}'")
++#            list(APPEND RUN_LIBS ${TIFF_RPATH})
++#        endif()
+     endif()
+ 
+-    if(TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
+-        set(HAVE_LIBTIFF TRUE)
+-        message(STATUS "Found Libtiff: '${TIFF_INCLUDE_DIR}', '${TIFF_LIBRARY}'")
+-    else()
+-        set(HAVE_LIBTIFF FALSE)
+-        message(STATUS "Libtiff include and library variables: '${TIFF_INCLUDE_DIR}', '${TIFF_LIBRARY}'")
+-        message(FATAL_ERROR "Libtiff not found")
+-    endif ()
++#    if(TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
++#        set(HAVE_LIBTIFF TRUE)
++#        message(STATUS "Found Libtiff: '${TIFF_INCLUDE_DIR}', '${TIFF_LIBRARY}'")
++#    else()
++#        set(HAVE_LIBTIFF FALSE)
++#        message(STATUS "Libtiff include and library variables: '${TIFF_INCLUDE_DIR}', '${TIFF_LIBRARY}'")
++#        message(FATAL_ERROR "Libtiff not found")
++#    endif ()
+ 
+     include_directories(${TIFF_INCLUDE_DIR})
+-    list(APPEND DEP_LIBS ${TIFF_LIBRARY})
++    list(APPEND DEP_LIBS TIFF::tiff)
+ endif ()
+ 
+