aboutsummaryrefslogtreecommitdiff
path: root/ports/catch
diff options
context:
space:
mode:
authoratkawa7 <atkawa7@yahoo.com>2017-06-15 19:52:03 -0700
committeratkawa7 <atkawa7@yahoo.com>2017-06-15 19:52:03 -0700
commite46dd1fd551a17a2900e09f52b8abd02a3758f4f (patch)
tree9c2671ad8a715eca875c1f4f02882a0811e3d54a /ports/catch
parentce5ad1ffe1ed0c6351a09b01bc92a2ad258b8f19 (diff)
parentc966c3709e65b53580e66fe9d0cab1d4414b0472 (diff)
downloadvcpkg-e46dd1fd551a17a2900e09f52b8abd02a3758f4f.tar.gz
vcpkg-e46dd1fd551a17a2900e09f52b8abd02a3758f4f.zip
Merge https://github.com/Microsoft/vcpkg
Diffstat (limited to 'ports/catch')
-rw-r--r--ports/catch/CONTROL2
-rw-r--r--ports/catch/portfile.cmake26
2 files changed, 10 insertions, 18 deletions
diff --git a/ports/catch/CONTROL b/ports/catch/CONTROL
index 4c9626863..cce74b299 100644
--- a/ports/catch/CONTROL
+++ b/ports/catch/CONTROL
@@ -1,3 +1,3 @@
Source: catch
-Version: 1.9.4
+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 670c51fbc..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.4/catch.hpp"
- FILENAME "catch.hpp"
- SHA512 efbb5086d1eff393cf7997cd51f7b42d43cf744425f1abab91f3fb84524e98f9e0fef22d6725c2f5a1fe89965035d2ea5ea6e005abcf85a747953cf0101c9407
+ 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.4/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)