diff options
| author | Raynor Vliegendhart <shinnonoir+git@gmail.com> | 2018-10-28 22:51:30 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-28 14:51:30 -0700 |
| commit | b084ab0103ad07f2f9000805b68d7202a231a248 (patch) | |
| tree | ac9dd4bced1303218c9ad269b3f922378a2c6594 | |
| parent | c23a7f5c9a28a0e5f796ca951c9428f9e224421b (diff) | |
| download | vcpkg-b084ab0103ad07f2f9000805b68d7202a231a248.tar.gz vcpkg-b084ab0103ad07f2f9000805b68d7202a231a248.zip | |
[libgeotiff] Install doc files into the correct place (#4593)
* [libgeotiff] Install doc files in the correct place
The original portfile put documentation (authors, readme, etc.) inside
of vcpkg/installed/<triplet>/doc. This commit modifies the portfile such
that the files are installed to
vcpkg/installed/<triplet>/share/libgeotiff/doc instead.
* [libgeotiff] Bump version
* [libgeotiff] Avoid file(INSTALL)
| -rw-r--r-- | ports/libgeotiff/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libgeotiff/portfile.cmake | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL index 8e8dbc3ef..dea361457 100644 --- a/ports/libgeotiff/CONTROL +++ b/ports/libgeotiff/CONTROL @@ -1,4 +1,4 @@ Source: libgeotiff -Version: 1.4.2-4 +Version: 1.4.2-6 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/portfile.cmake b/ports/libgeotiff/portfile.cmake index 2c83b451a..afd203b03 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -36,7 +36,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libgeotiff RENAME copyright) +configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/libgeotiff/copyright COPYONLY) if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") file(GLOB GEOTIFF_UTILS ${CURRENT_PACKAGES_DIR}/bin/*) @@ -44,7 +44,7 @@ else() file(GLOB GEOTIFF_UTILS ${CURRENT_PACKAGES_DIR}/bin/*.exe) endif() -file(INSTALL ${GEOTIFF_UTILS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/libgeotiff/) +file(COPY ${GEOTIFF_UTILS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/libgeotiff) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libgeotiff) file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) @@ -56,4 +56,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT V file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) endif() +# Move and cleanup doc files +file(RENAME ${CURRENT_PACKAGES_DIR}/doc ${CURRENT_PACKAGES_DIR}/share/libgeotiff/doc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) + vcpkg_copy_pdbs() |