[libgeotiff] fix problems with config/targets (#6596)

* [libgeotiff] fix problems with config/targets

* fixing case

* all lower case....

* hopefully this fix works everywhere
This commit is contained in:
Alexander Neumann 2019-05-25 00:11:42 +02:00 committed by Victor Romero
parent ff77285e6b
commit c5bd18d373
3 changed files with 26 additions and 1 deletions

View File

@ -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

View File

@ -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)

View File

@ -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)