diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-05-25 00:11:42 +0200 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-05-24 15:11:42 -0700 |
| commit | c5bd18d3737a3e31d1a2f9a03162bb0f9d745784 (patch) | |
| tree | eaf13bb662abc03478551129bf5a7f55edff621e | |
| parent | ff77285e6beed8254d09c801444f0a8529606802 (diff) | |
| download | vcpkg-c5bd18d3737a3e31d1a2f9a03162bb0f9d745784.tar.gz vcpkg-c5bd18d3737a3e31d1a2f9a03162bb0f9d745784.zip | |
[libgeotiff] fix problems with config/targets (#6596)
* [libgeotiff] fix problems with config/targets
* fixing case
* all lower case....
* hopefully this fix works everywhere
| -rw-r--r-- | ports/libgeotiff/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libgeotiff/geotiff-config.patch | 17 | ||||
| -rw-r--r-- | ports/libgeotiff/portfile.cmake | 8 |
3 files changed, 26 insertions, 1 deletions
diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL index edfa7f0cb..34d804005 100644 --- a/ports/libgeotiff/CONTROL +++ b/ports/libgeotiff/CONTROL @@ -1,4 +1,4 @@ Source: libgeotiff -Version: 1.4.2-7 +Version: 1.4.2-8 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 diff --git a/ports/libgeotiff/geotiff-config.patch b/ports/libgeotiff/geotiff-config.patch new file mode 100644 index 000000000..284c64146 --- /dev/null +++ b/ports/libgeotiff/geotiff-config.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in +index 0dd376aca..0615081bd 100644 +--- a/cmake/project-config.cmake.in ++++ b/cmake/project-config.cmake.in +@@ -23,6 +23,12 @@ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}") + message (STATUS
+ "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME@_VERSION}")
+
++#Find dependencies
++if(@WITH_PROJ4@)
++ include(CMakeFindDependencyMacro)
++ find_dependency(PROJ4)
++endif()
++
+ # Tell the user project where to find our headers and libraries
+ get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+ get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE)
diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake index fc79fe15d..bb64e7ac2 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_extract_source_archive_ex( 0004-Fix-libxtiff-installation.patch 0005-Control-shared-library-build-with-option.patch 0006-Fix-utility-link-error.patch + geotiff-config.patch ) # Delete FindPROJ4.cmake @@ -37,6 +38,13 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +if(WIN32) + vcpkg_fixup_cmake_targets(CONFIG_PATH share/GeoTIFF) + file(RENAME ${CURRENT_PACKAGES_DIR}/share/libgeotiff ${CURRENT_PACKAGES_DIR}/share/geotiff) # move configs to expected location +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/GeoTIFF) + file(RENAME ${CURRENT_PACKAGES_DIR}/share/libgeotiff ${CURRENT_PACKAGES_DIR}/share/geotiff) # move configs to expected location +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/libgeotiff/copyright COPYONLY) |