diff options
| author | Casey Carter <Casey@Carter.net> | 2016-10-17 17:11:42 -0700 |
|---|---|---|
| committer | Casey Carter <Casey@Carter.net> | 2016-10-17 17:11:42 -0700 |
| commit | 6fb82365f49901fee330ae00ba0be7a0f85be06d (patch) | |
| tree | 9aa73396960b3872c4dc12e0ab5372478ee2a307 | |
| parent | 99623d66c8ec2c833d9662547f479a3cd8dfab39 (diff) | |
| download | vcpkg-6fb82365f49901fee330ae00ba0be7a0f85be06d.tar.gz vcpkg-6fb82365f49901fee330ae00ba0be7a0f85be06d.zip | |
range-v3 builds from 2 distinct pieces:
* Upstream sources from the fork point (https://github.com/ericniebler/range-v3/commit/6eb5c831ffe12cd5cb96390dbe917ca1b248772d)
* Separate patch that applies MSVC workarounds from https://github.com/Microsoft/Range-V3-VS2015
| -rw-r--r-- | ports/range-v3/CONTROL | 2 | ||||
| -rw-r--r-- | ports/range-v3/portfile.cmake | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index a04b8d3b7..712e295d7 100644 --- a/ports/range-v3/CONTROL +++ b/ports/range-v3/CONTROL @@ -1,3 +1,3 @@ Source: range-v3 -Version: 0.0.0-1 +Version: 0.0.0-2 Description: Range library for C++11/14/17. diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index 692adf347..5d2d89783 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -1,12 +1,19 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/Range-V3-VS2015-ede9ad367fd5ec764fecb039c874614bd908e6b6) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/range-v3-6eb5c831ffe12cd5cb96390dbe917ca1b248772d) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Microsoft/Range-V3-VS2015/archive/ede9ad367fd5ec764fecb039c874614bd908e6b6.zip" - FILENAME "range-v3-ede9ad367fd5ec764fecb039c874614bd908e6b6.zip" - SHA512 e978c7694471d8616c248647b77689f377b3e2517347abde8629b140e5994de8bf686565a24cdd7dd222f325d43b775f5e478c91220dce75313985499b134637 + 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...2cb66781c8ac72a55fff1436e8fc8170a2ce8509.diff" + FILENAME "range-v3-fork_base_to_2cb66781c8ac72a55fff1436e8fc8170a2ce8509.diff" + SHA512 5c1728387967a5c14596d6d71e7c28f0206c22b652f4c96955711bcb805816eb106b62fcfde0a7d514eeed28fe6ce1f8c593fa3ef7df70f8da3b88b6d79c1515 ) vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${DIFF}) + 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) file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp") |