diff options
| author | Casey Carter <Casey@Carter.net> | 2017-05-30 18:05:28 -0700 |
|---|---|---|
| committer | Casey Carter <Casey@Carter.net> | 2017-05-30 18:10:37 -0700 |
| commit | eac9ab7fabfe68f9b78e6e8f42e1c091855490f6 (patch) | |
| tree | a4748c3405908afea91d76d53e2cc3fcf75778a3 | |
| parent | ce8b2eaa750aabe80b3da7533931fbf8598cec26 (diff) | |
| download | vcpkg-eac9ab7fabfe68f9b78e6e8f42e1c091855490f6.tar.gz vcpkg-eac9ab7fabfe68f9b78e6e8f42e1c091855490f6.zip | |
[range-v3] update version
...and don't bother with the "get upstream and then patch" dance.
| -rw-r--r-- | ports/range-v3/CONTROL | 2 | ||||
| -rw-r--r-- | ports/range-v3/portfile.cmake | 33 |
2 files changed, 21 insertions, 14 deletions
diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index 942851b42..2bf8b6087 100644 --- a/ports/range-v3/CONTROL +++ b/ports/range-v3/CONTROL @@ -1,3 +1,3 @@ Source: range-v3 -Version: 20150729-vcpkg3 +Version: 20151130-vcpkg4 Description: Range library for C++11/14/17. diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index 150b52c8a..61429548b 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -1,19 +1,26 @@ #header-only library include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/range-v3-6eb5c831ffe12cd5cb96390dbe917ca1b248772d) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/ericniebler/range-v3/archive/6eb5c831ffe12cd5cb96390dbe917ca1b248772d.zip" - FILENAME "range-v3-6eb5c831ffe12cd5cb96390dbe917ca1b248772d.zip" - SHA512 2605af46c2c049f66dc982b1c4e506a8f115d47cc6c61a80f08921c667e52ad3097c485280ee43711c84b84a1490929e085b89cf9ad4c83b93222315210e92aa -) -vcpkg_download_distfile(DIFF - URLS "https://github.com/Microsoft/Range-V3-VS2015/compare/fork_base...00ed689bac7a9dcd8601dbde382758675516799d.diff" - FILENAME "range-v3-fork_base_to_00ed689bac7a9dcd8601dbde382758675516799d.diff" - SHA512 6158cd9ee1f5957294a26dc780c881839e0bae8610688a618cd11d47df34d5e543fa09ac9a3b33d4a65af8eceae0a6a3055621206c291ef75f982e7915daf91a -) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${DIFF}) +# set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/range-v3-6eb5c831ffe12cd5cb96390dbe917ca1b248772d) +# vcpkg_download_distfile(ARCHIVE +# URLS "https://github.com/ericniebler/range-v3/archive/6eb5c831ffe12cd5cb96390dbe917ca1b248772d.zip" +# FILENAME "range-v3-6eb5c831ffe12cd5cb96390dbe917ca1b248772d.zip" +# SHA512 2605af46c2c049f66dc982b1c4e506a8f115d47cc6c61a80f08921c667e52ad3097c485280ee43711c84b84a1490929e085b89cf9ad4c83b93222315210e92aa +# ) +# vcpkg_download_distfile(DIFF +# URLS "https://github.com/Microsoft/Range-V3-VS2015/compare/fork_base...00ed689bac7a9dcd8601dbde382758675516799d.diff" +# FILENAME "range-v3-fork_base_to_00ed689bac7a9dcd8601dbde382758675516799d.diff" +# SHA512 6158cd9ee1f5957294a26dc780c881839e0bae8610688a618cd11d47df34d5e543fa09ac9a3b33d4a65af8eceae0a6a3055621206c291ef75f982e7915daf91a +# ) +# vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/Range-V3-VS2015 + REF 2695c779d52717b635e97352fed6b75d32eba7a4 + SHA512 a1dad795b15c8491963f75fb58097dd290203406038cb2790c66b7ebd854a42043a92cfa2fed30c125529c3aa8d0cfc05cf1d149c84e96eb1f865857ad87adeb + HEAD_REF master +) file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/range-v3) file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3/copyright) |