diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-11-15 14:02:55 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-11-15 14:02:55 -0800 |
| commit | 2060eefa86d80150151d662602a5b818ad40d724 (patch) | |
| tree | 7aa9292faa06f2c5bbc2cb4fbeea008636f274f8 | |
| parent | b79ad151244b6c11c3b2926b8e3881a5aec47c4d (diff) | |
| parent | 3712c3cbcfde189e4b4138f189310d13fa245f2e (diff) | |
| download | vcpkg-2060eefa86d80150151d662602a5b818ad40d724.tar.gz vcpkg-2060eefa86d80150151d662602a5b818ad40d724.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4734
| -rw-r--r-- | ports/cli11/CONTROL | 3 | ||||
| -rw-r--r-- | ports/cli11/portfile.cmake | 29 | ||||
| -rw-r--r-- | ports/tiff/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tiff/portfile.cmake | 4 |
4 files changed, 35 insertions, 3 deletions
diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL new file mode 100644 index 000000000..5174d7037 --- /dev/null +++ b/ports/cli11/CONTROL @@ -0,0 +1,3 @@ +Source: cli11 +Version: 1.6.1 +Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. <https://github.com/CLIUtils/CLI11> diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake new file mode 100644 index 000000000..bda9fa2b3 --- /dev/null +++ b/ports/cli11/portfile.cmake @@ -0,0 +1,29 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CLIUtils/CLI11 + REF v1.6.1 + SHA512 df12510bb78823908535a68af65fb8ea0b8b33b362e0b5f2cfa91223db7ebd9e71a55dfe31902c5d10e29c02a9bb59be58f8c69da7a9b4ab456ace64f200ac93 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCLI11_TESTING=OFF + -DCLI11_EXAMPLES=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CLI11) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cli11 RENAME copyright) + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME cli11) diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index cb40597b4..866437737 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.9-6 +Version: 4.0.10 Build-Depends: zlib, libjpeg-turbo, liblzma (!uwp) Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 7062c1ce1..13d8ac7bc 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -1,11 +1,11 @@ include(vcpkg_common_functions) -set(LIBTIFF_VERSION 4.0.9) +set(LIBTIFF_VERSION 4.0.10) vcpkg_download_distfile(ARCHIVE URLS "http://download.osgeo.org/libtiff/tiff-${LIBTIFF_VERSION}.tar.gz" FILENAME "tiff-${LIBTIFF_VERSION}.tar.gz" - SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd + SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH |