diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-13 11:13:43 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-13 11:13:43 -0800 |
| commit | 5fc3a10651dc80201b4a870043a0cef6b3c72ff3 (patch) | |
| tree | 22a3a9073a29a555540539f1c5f6c0f5360b506d /ports/range-v3 | |
| parent | 9e773bd912e42a413f87e9fb1a6712461e10c4bf (diff) | |
| parent | e04b4ed5b5ff5c1b61e5ce3d70ac101ffe3237c4 (diff) | |
| download | vcpkg-5fc3a10651dc80201b4a870043a0cef6b3c72ff3.tar.gz vcpkg-5fc3a10651dc80201b4a870043a0cef6b3c72ff3.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4914
Diffstat (limited to 'ports/range-v3')
| -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..076c71211 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-20181129 Description: Range library for C++11/14/17. diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index cbeb38bf0..f7577c9bb 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 cf8add9f467aac695b9fa38e168b90df36b1a806 + SHA512 92b1c09a423f6672b710abfde886b28d789a030f0f5db1c340ab75eead4abcf1a8b213adeb197af92747678873b1cae62362ee878c2a6bb38e532b0e83ac7bb2 + 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) |