diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-10-14 05:38:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 14:38:05 -0700 |
| commit | eaa2e3db0fa6162112fa76e87ac44a67db7225c8 (patch) | |
| tree | 0e30601250da795ad578da1ec5bc52d2c3e4b93d /ports/libgeotiff/fix-proj4.patch | |
| parent | c633ef256fc2702090cd27925d0eeb5075beb844 (diff) | |
| download | vcpkg-eaa2e3db0fa6162112fa76e87ac44a67db7225c8.tar.gz vcpkg-eaa2e3db0fa6162112fa76e87ac44a67db7225c8.zip | |
[libgeotiff] Upgrade to version 1.6.0 (#10408)
Diffstat (limited to 'ports/libgeotiff/fix-proj4.patch')
| -rw-r--r-- | ports/libgeotiff/fix-proj4.patch | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/ports/libgeotiff/fix-proj4.patch b/ports/libgeotiff/fix-proj4.patch index d6e8bce8a..15960400f 100644 --- a/ports/libgeotiff/fix-proj4.patch +++ b/ports/libgeotiff/fix-proj4.patch @@ -1,17 +1,32 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 617978c..baf45bc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -146,8 +146,11 @@ IF(WITH_PROJ4) - endif () +diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt +index 46331ad..80fe121 100644 +--- a/libgeotiff/CMakeLists.txt ++++ b/libgeotiff/CMakeLists.txt +@@ -122,13 +122,14 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/libxtiff) + # TIFF support - required, default=ON + SET(WITH_TIFF TRUE CACHE BOOL "Choose if TIFF support should be built") - IF(PROJ4_FOUND) -- ADD_DEFINITIONS(-DHAVE_LIBPROJ=1) -+ ADD_DEFINITIONS(-DHAVE_LIBPROJ=1 -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1) - INCLUDE_DIRECTORIES(${PROJ4_INCLUDE_DIR}) -+ IF(NOT WIN32) -+ LIST(APPEND PROJ4_LIBRARIES ${CMAKE_DL_LIBS}) -+ ENDIF() - ENDIF() +-FIND_PACKAGE(PROJ NO_MODULE QUIET) +-if (NOT PROJ_FOUND) ++FIND_PACKAGE(PROJ4 CONFIG REQUIRED) ++if (NOT PROJ4_FOUND) + FIND_PACKAGE(PROJ) + endif () + +-IF(PROJ_FOUND) +- INCLUDE_DIRECTORIES(${PROJ_INCLUDE_DIR}) ++IF(PROJ4_FOUND) ++ INCLUDE_DIRECTORIES(${PROJ4_INCLUDE_DIRS}) ++ ADD_DEFINITIONS(-DHAVE_LIBPROJ=1 -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1) + ELSE() + MESSAGE(FATAL_ERROR "Failed to detect PROJ >= 6") ENDIF() +@@ -361,7 +362,7 @@ SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES + + TARGET_LINK_LIBRARIES(${GEOTIFF_LIBRARY_TARGET} + ${TIFF_LIBRARIES} +- ${PROJ_LIBRARIES} ++ ${PROJ4_LIBRARIES} + ${ZLIB_LIBRARIES} + ${JPEG_LIBRARIES}) |