diff options
| author | Casey Carter <Casey@Carter.net> | 2018-11-07 08:52:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 08:52:21 -0800 |
| commit | 2fe74dae99d0755ffbc8c93b1b1c0a46b2960612 (patch) | |
| tree | 85a6f97832f9154a0d882793e8c854cd7341894f | |
| parent | 9ad166279c913cf0becc56865d05ed5806fad8aa (diff) | |
| parent | 5b41d50f977e8a21a6c1b2e1957867c012c97f03 (diff) | |
| download | vcpkg-2fe74dae99d0755ffbc8c93b1b1c0a46b2960612.tar.gz vcpkg-2fe74dae99d0755ffbc8c93b1b1c0a46b2960612.zip | |
Merge pull request #4669 from Microsoft/dev/alkarata/rangev3
Dev/alkarata/rangev3
| -rw-r--r-- | ports/range-v3/CONTROL | 3 | ||||
| -rw-r--r-- | ports/range-v3/portfile.cmake | 50 |
2 files changed, 23 insertions, 30 deletions
diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index ee21c16c9..1ed4dc94c 100644 --- a/ports/range-v3/CONTROL +++ b/ports/range-v3/CONTROL @@ -1,4 +1,3 @@ Source: range-v3 -Version: 0.3.5 -Build-Depends: range-v3-vs2015 (windows), range-v3-vs2015 (uwp) +Version: 0.4.0-01ccd0e Description: Range library for C++11/14/17. diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index cbeb38bf0..f1d78711b 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -1,36 +1,30 @@ include(vcpkg_common_functions) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) - message("The current range-v3 releases are not compatible with the current MSVC releases.") - message("The latest available range-v3 fork compatible with MSVC will be used instead.") - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -else() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ericniebler/range-v3 - REF 0.3.5 - SHA512 0b8b97c32760f19e7a3f35b0f28b0c15c7735fbd1aa54f685c58faf50bf2cf112aed4ac7cfa9154b9caf7047400a6c7fd5c33d978f2e3cec6bc392a758aeabad - HEAD_REF master - ) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ericniebler/range-v3 + REF 01ccd0e552860efe00e4e3e55bf823be445aabb4 + SHA512 5e6c3e597dc40128ae0642ca43340c88654c25d9239e6929edda44035f23b7dec3735baecd486ca3b161b453c8fe826f82124ced24da66e288e0e93fa5d51c54 + HEAD_REF master +) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DRANGE_V3_NO_TESTING=ON - -DRANGE_V3_NO_EXAMPLE=ON - -DRANGE_V3_NO_PERF=ON - -DRANGE_V3_NO_HEADER_CHECK=ON - ) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DRANGE_V3_TESTS=OFF + -DRANGE_V3_EXAMPLES=OFF + -DRANGE_V3_PERF=OFF + -DRANGE_V3_HEADER_CHECKS=OFF +) - vcpkg_install_cmake() +vcpkg_install_cmake() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/range-v3) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/range-v3) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) - vcpkg_copy_pdbs() +vcpkg_copy_pdbs() - 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) -endif() +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) |