aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-05-09 20:56:46 -0700
committerGitHub <noreply@github.com>2017-05-09 20:56:46 -0700
commit8c38bf62d62e2b77bdbdc01b579091f84bdc7fb0 (patch)
tree0f62e0d9233fff1ce990a95ce0cf9cd6a3526e37
parentadd92555384f59ab10b6f551db0b685f8e9e5323 (diff)
parent29cc5780feaacbfa77dabbc2230f29c57dbbef29 (diff)
downloadvcpkg-8c38bf62d62e2b77bdbdc01b579091f84bdc7fb0.tar.gz
vcpkg-8c38bf62d62e2b77bdbdc01b579091f84bdc7fb0.zip
Merge pull request #1063 from sdcb/rx4
[rxcpp] upgrade to 4.0.0
-rw-r--r--ports/rxcpp/CONTROL2
-rw-r--r--ports/rxcpp/portfile.cmake14
2 files changed, 9 insertions, 7 deletions
diff --git a/ports/rxcpp/CONTROL b/ports/rxcpp/CONTROL
index 02b873816..7bf2aca17 100644
--- a/ports/rxcpp/CONTROL
+++ b/ports/rxcpp/CONTROL
@@ -1,3 +1,3 @@
Source: rxcpp
-Version: 3.0.0
+Version: 4.0.0-1
Description: Reactive Extensions for C++ \ No newline at end of file
diff --git a/ports/rxcpp/portfile.cmake b/ports/rxcpp/portfile.cmake
index 4a321222d..00b154989 100644
--- a/ports/rxcpp/portfile.cmake
+++ b/ports/rxcpp/portfile.cmake
@@ -1,12 +1,14 @@
#header-only library
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-3.0.0)
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/Reactive-Extensions/RxCpp/archive/v3.0.0.tar.gz"
- FILENAME "RxCpp-v3.0.0.tar.gz"
- SHA512 6d810b6163d0920d531f32a13729e290c81b47d5fc9c3e3d3d8a25d27a6f0671fec097d091bef7383b7e556e9e5471db087bb955e7f4fd9a5fdc9e7b06050844
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-4.0.0)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO Reactive-Extensions/RxCpp
+ REF v4.0.0
+ SHA512 df7582925e749fb7f9fbc085566d57a46571e18202aacaa7d35cf9da8152b29dd2886b2d07dae93e538f2a0f7b91d93fb3da23c34c7ea4467772515c794a25b7
+ HEAD_REF master
)
-vcpkg_extract_source_archive(${ARCHIVE})
file(INSTALL
${SOURCE_PATH}/Rx/v2/src/rxcpp