From 70cf49fac24dec90deed153da5b11b9401dc36d5 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 30 Oct 2018 14:10:41 -0700 Subject: [PATCH 1/2] [range-v3] Update. Use ericniebler/range-v3 even for Windows --- ports/range-v3/CONTROL | 3 +-- ports/range-v3/portfile.cmake | 51 ++++++++++++++++------------------- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index ee21c16c9e1..b5a96d78990 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- 7f2eb04 Description: Range library for C++11/14/17. diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index cbeb38bf0d4..83292e4abb9 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -1,36 +1,31 @@ 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 7f2eb04e62e44074ddae64ba3715bc800f7c317b + SHA512 118e4bdba0ade864967ca56f82c7b26cfb6767c483844ffb9995b5e860533d365f91f6795b227e78a228569a2280e995c6d23feac5c493ad7718b6ae00d40eed + 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=ON + -DRANGE_V3_EXAMPLES=ON + -DRANGE_V3_PERF=ON + -DRANGE_V3_HEADER_CHECKS=ON + -DRANGES_CXX_STD=17 +) - 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) \ No newline at end of file From 5b41d50f977e8a21a6c1b2e1957867c012c97f03 Mon Sep 17 00:00:00 2001 From: Casey Carter Date: Wed, 31 Oct 2018 14:55:17 -0700 Subject: [PATCH 2/2] range-v3: update the commit; don't build tests --- ports/range-v3/CONTROL | 2 +- ports/range-v3/portfile.cmake | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index b5a96d78990..1ed4dc94cae 100644 --- a/ports/range-v3/CONTROL +++ b/ports/range-v3/CONTROL @@ -1,3 +1,3 @@ Source: range-v3 -Version: 0.4.0- 7f2eb04 +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 83292e4abb9..f1d78711b1f 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ericniebler/range-v3 - REF 7f2eb04e62e44074ddae64ba3715bc800f7c317b - SHA512 118e4bdba0ade864967ca56f82c7b26cfb6767c483844ffb9995b5e860533d365f91f6795b227e78a228569a2280e995c6d23feac5c493ad7718b6ae00d40eed + REF 01ccd0e552860efe00e4e3e55bf823be445aabb4 + SHA512 5e6c3e597dc40128ae0642ca43340c88654c25d9239e6929edda44035f23b7dec3735baecd486ca3b161b453c8fe826f82124ced24da66e288e0e93fa5d51c54 HEAD_REF master ) @@ -12,11 +12,10 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DRANGE_V3_TESTS=ON - -DRANGE_V3_EXAMPLES=ON - -DRANGE_V3_PERF=ON - -DRANGE_V3_HEADER_CHECKS=ON - -DRANGES_CXX_STD=17 + -DRANGE_V3_TESTS=OFF + -DRANGE_V3_EXAMPLES=OFF + -DRANGE_V3_PERF=OFF + -DRANGE_V3_HEADER_CHECKS=OFF ) vcpkg_install_cmake() @@ -28,4 +27,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) 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) \ No newline at end of file +file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3/copyright)