blob: 7900d1252b90a4194147b21361728806decfaac7 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
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 ()
|
