diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-15 10:18:14 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-06-15 10:18:14 -0700 |
| commit | d1c32d241f8c06dc7169ea43070032229b2a7eb0 (patch) | |
| tree | 98de6193b51c08b777bc1b6703f80f13e9271152 | |
| parent | b7fbd0bb6d17d9912a4f57ac6afeb20d4de237f0 (diff) | |
| download | vcpkg-d1c32d241f8c06dc7169ea43070032229b2a7eb0.tar.gz vcpkg-d1c32d241f8c06dc7169ea43070032229b2a7eb0.zip | |
[catch] Rename downloaded files to not conflict with older versions or other ports
| -rw-r--r-- | ports/catch/CONTROL | 2 | ||||
| -rw-r--r-- | ports/catch/portfile.cmake | 24 |
2 files changed, 9 insertions, 17 deletions
diff --git a/ports/catch/CONTROL b/ports/catch/CONTROL index 883643ad5..cce74b299 100644 --- a/ports/catch/CONTROL +++ b/ports/catch/CONTROL @@ -1,3 +1,3 @@ Source: catch -Version: 1.9.5 +Version: 1.9.5-1 Description: C++ Automated Test Cases in Headers diff --git a/ports/catch/portfile.cmake b/ports/catch/portfile.cmake index 2fae419b0..d3cd5a2bb 100644 --- a/ports/catch/portfile.cmake +++ b/ports/catch/portfile.cmake @@ -1,26 +1,18 @@ -# Common Ambient Variables: -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# TARGET_TRIPLET is the current triplet (x86-windows, etc) -# PORT is the current port name (zlib, etc) -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# - -#header-only library include(vcpkg_common_functions) +set(CATCH_VERSION v1.9.5) + vcpkg_download_distfile(HEADER - URLS "https://github.com/philsquared/Catch/releases/download/v1.9.5/catch.hpp" - FILENAME "catch.hpp" + URLS "https://github.com/philsquared/Catch/releases/download/${CATCH_VERSION}/catch.hpp" + FILENAME "catch-${CATCH_VERSION}.hpp" SHA512 4e5dc6959903282c90c7e7981238248072c7f5d4083ccfcd62ca8db494bed46cbd280624d1bafaf2221ca02e7877a4cc319f1adee06dfaeee9da3757b7a7ba56 ) vcpkg_download_distfile(LICENSE - URLS "https://raw.githubusercontent.com/philsquared/Catch/v1.9.5/LICENSE.txt" - FILENAME "LICENSE.txt" + URLS "https://raw.githubusercontent.com/philsquared/Catch/${CATCH_VERSION}/LICENSE.txt" + FILENAME "catch-LICENSE-${CATCH_VERSION}.txt" SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 ) -file(COPY ${HEADER} DESTINATION ${CURRENT_PACKAGES_DIR}/include ) -file(COPY ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/catch ) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/catch/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/catch/copyright) +file(INSTALL ${HEADER} DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME catch.hpp) +file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/catch RENAME copyright) |