mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 13:48:59 +08:00
6f92f7acc5
- Import CMakeLists updates from libgeotiff trunk HEAD. It makes unify target name among static/shared libs. - Rebased patches and generated from git format-patch command. These two patches are as same code as previous one. - Publish patches on https://github.com/miurahr/libgeotiff Signed-off-by: Hiroshi Miura <miurahr@linux.com>
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From bc0003ab3d94f271b27f6897259b734709a5d6cf Mon Sep 17 00:00:00 2001
|
|
From: Hiroshi Miura <miurahr@linux.com>
|
|
Date: Wed, 14 Feb 2018 12:32:11 +0900
|
|
Subject: [PATCH 3/5] Fix cmake TIFF detection
|
|
|
|
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
|
|
---
|
|
CMakeLists.txt | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 55ececf..1e2fe3d 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -191,7 +191,8 @@ IF(WITH_TIFF)
|
|
IF(TIFF_FOUND)
|
|
# Confirm required API is available
|
|
INCLUDE(CheckFunctionExists)
|
|
- SET(CMAKE_REQUIRED_LIBRARIES ${TIFF_LIBRARIES})
|
|
+ FIND_PACKAGE(LibLZMA)
|
|
+ SET(CMAKE_REQUIRED_LIBRARIES ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${LIBLZMA_LIBRARIES})
|
|
|
|
CHECK_FUNCTION_EXISTS(TIFFOpen HAVE_TIFFOPEN)
|
|
IF(NOT HAVE_TIFFOPEN)
|
|
@@ -204,7 +205,7 @@ IF(WITH_TIFF)
|
|
SET(TIFF_FOUND) # ReSET to NOT found for TIFF library
|
|
MESSAGE(FATAL_ERROR "Failed to link with libtiff - TIFFMergeFieldInfo function not found. libtiff 3.6.0 Beta or later required. Please upgrade or use an older version of libgeotiff")
|
|
ENDIF()
|
|
-
|
|
+ SET(CMAKE_REQUIRED_LIBRARIES)
|
|
INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
|
|
ADD_DEFINITIONS(-DHAVE_TIFF=1)
|
|
ENDIF(TIFF_FOUND)
|
|
--
|
|
2.16.1
|
|
|