[libgeotiff] fix util link error (#2896)

* [libgeotiff] fix util link error

* [libgeotiff] Bump package version
This commit is contained in:
Hiroshi Miura 2018-02-28 05:13:57 +09:00 committed by Robert Schumacher
parent 781cc32611
commit fd08d14bdb
3 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,42 @@
From 2625b4a85b6cacf9b6ede3cf30af16eb795044e9 Mon Sep 17 00:00:00 2001
From: Hiroshi Miura <miurahr@linux.com>
Date: Sat, 24 Feb 2018 08:36:31 +0900
Subject: [PATCH 6/6] Fix utility link error
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
---
bin/CMakeLists.txt | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 583ae36..6c6cc21 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -6,10 +6,6 @@
#
###############################################################################
-INCLUDE_DIRECTORIES(
- .
- ${CMAKE_SOURCE_DIR})
-
IF(WIN32 AND MSVC)
SET(GETOPT_SOURCE getopt.c)
ENDIF()
@@ -22,12 +18,11 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build")
FOREACH(utility ${GEOTIFF_UTILITIES})
ADD_EXECUTABLE(${utility} ${utility}.c ${GETOPT_SOURCE})
- TARGET_LINK_LIBRARIES(${utility} xtiff ${GEOTIFF_LIBRARY_TARGET})
+ TARGET_LINK_LIBRARIES(${utility} ${GEOTIFF_LIBRARY_TARGET})
ENDFOREACH()
ADD_EXECUTABLE(geotifcp geotifcp.c ${GETOPT_SOURCE})
TARGET_LINK_LIBRARIES(geotifcp
- xtiff
${GEOTIFF_LIBRARY_TARGET}
${JPEG_LIBRARIES}
${ZLIB_LIBRARIES})
--
2.16.1

View File

@ -1,4 +1,4 @@
Source: libgeotiff
Version: 1.4.2-2
Version: 1.4.2-3
Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags.
Build-Depends: tiff, proj4, zlib, libjpeg-turbo

View File

@ -18,6 +18,7 @@ vcpkg_apply_patches(
"${CMAKE_CURRENT_LIST_DIR}/0003-Fix-cmake-TIFF-detection.patch"
"${CMAKE_CURRENT_LIST_DIR}/0004-Fix-libxtiff-installation.patch"
"${CMAKE_CURRENT_LIST_DIR}/0005-Control-shared-library-build-with-option.patch"
"${CMAKE_CURRENT_LIST_DIR}/0006-Fix-utility-link-error.patch"
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)