diff options
| author | Hiroshi Miura <miurahr@linux.com> | 2018-02-17 20:14:58 +0900 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-17 03:14:58 -0800 |
| commit | 6142925568ed0b8532feb40453dc556c2f3fa4d7 (patch) | |
| tree | f89044969d335e29f403a6e6f3629c9b989a6080 | |
| parent | 621bde044b76e3482667a0ae6c8357f714dee746 (diff) | |
| download | vcpkg-6142925568ed0b8532feb40453dc556c2f3fa4d7.tar.gz vcpkg-6142925568ed0b8532feb40453dc556c2f3fa4d7.zip | |
[libgeotiff] build and install utility commands (#2784)
* [libgeotiff] install utility commands
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
* [libgeotiff] install utility only when release build and unconditionaly copy tool dependencies
* [libgeotiff] fix tool instalation when static and bump version
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
| -rw-r--r-- | ports/libgeotiff/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libgeotiff/portfile.cmake | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL index 8950200d9..f9fb872bb 100644 --- a/ports/libgeotiff/CONTROL +++ b/ports/libgeotiff/CONTROL @@ -1,4 +1,4 @@ Source: libgeotiff -Version: 1.4.2 +Version: 1.4.2-1 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 36be37bb6..443c07acb 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -26,11 +26,12 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} - -DWITH_UTILITIES=OFF -DWITH_TIFF=ON -DWITH_PROJ4=ON -DWITH_ZLIB=ON -DWITH_JPEG=ON + OPTIONS_RELEASE -DWITH_UTILITIES=ON + OPTIONS_DEBUG -DWITH_UTILITIES=OFF ) vcpkg_build_cmake() @@ -40,6 +41,11 @@ vcpkg_copy_pdbs() 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) +file(GLOB GEOTIFF_UTILS ${CURRENT_PACKAGES_DIR}/bin/*.exe) +file(INSTALL ${GEOTIFF_UTILS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/libgeotiff/) +file(REMOVE ${GEOTIFF_UTILS}) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libgeotiff) + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) -endif()
\ No newline at end of file +endif() |