From db5f96d5b4414941fd4398b6ad879354785200d0 Mon Sep 17 00:00:00 2001 From: Xiang Fan Date: Thu, 24 May 2018 17:45:48 -0700 Subject: Add a new boost-hana-msvc port which allows MSVC 15.7 RTM to build boost hana (certain tests / examples require /Zc:ternary). boost-hana will now redirect to this new port under Windows platform. --- ports/boost-hana-msvc/CONTROL | 5 +++++ ports/boost-hana-msvc/portfile.cmake | 14 ++++++++++++++ ports/boost-hana/CONTROL | 2 +- ports/boost-hana/portfile.cmake | 6 ++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 ports/boost-hana-msvc/CONTROL create mode 100644 ports/boost-hana-msvc/portfile.cmake diff --git a/ports/boost-hana-msvc/CONTROL b/ports/boost-hana-msvc/CONTROL new file mode 100644 index 000000000..da9d6a3a6 --- /dev/null +++ b/ports/boost-hana-msvc/CONTROL @@ -0,0 +1,5 @@ +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +Source: boost-hana-msvc +Version: 1.67.0 +Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers +Description: Boost hana module diff --git a/ports/boost-hana-msvc/portfile.cmake b/ports/boost-hana-msvc/portfile.cmake new file mode 100644 index 000000000..c0e61600a --- /dev/null +++ b/ports/boost-hana-msvc/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xiangfan-ms/hana + REF caa985795ab6c4b2c7bcf1458ccbb6ded65c15cb + SHA512 7ed65bda17042c42f7a76d88e66df61155800066119f6b256e20cf04dcd18d46584d3e44ad6555e9a17d9c0bf85fbf173ae6079f5a4a878341f959c855ebee6b + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-hana/CONTROL b/ports/boost-hana/CONTROL index 0cdc62ad6..277954948 100644 --- a/ports/boost-hana/CONTROL +++ b/ports/boost-hana/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-hana Version: 1.67.0 -Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers +Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers, boost-hana-msvc (windows), boost-hana-msvc (uwp) Description: Boost hana module diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index 5a48a4e9e..1ce675cf0 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -2,6 +2,11 @@ include(vcpkg_common_functions) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + message("The current MSVC releases can't compile boost hana yet.") + message("Use a fork from boost 1.67 which has source workarounds instead.") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hana @@ -12,3 +17,4 @@ vcpkg_from_github( include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) +endif() -- cgit v1.2.3 From 67f3be7bf94bcac4e6a68eff746fb96de0a79380 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 24 May 2018 18:25:41 -0700 Subject: Fix #Automatically generated comment. Bump version --- ports/boost-hana-msvc/CONTROL | 3 +-- ports/boost-hana-msvc/portfile.cmake | 2 -- ports/boost-hana/CONTROL | 4 ++-- ports/boost-hana/portfile.cmake | 10 +++++----- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ports/boost-hana-msvc/CONTROL b/ports/boost-hana-msvc/CONTROL index da9d6a3a6..0d2f178f8 100644 --- a/ports/boost-hana-msvc/CONTROL +++ b/ports/boost-hana-msvc/CONTROL @@ -1,5 +1,4 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-hana-msvc -Version: 1.67.0 +Version: 1.67.0-1 Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers Description: Boost hana module diff --git a/ports/boost-hana-msvc/portfile.cmake b/ports/boost-hana-msvc/portfile.cmake index c0e61600a..c56926499 100644 --- a/ports/boost-hana-msvc/portfile.cmake +++ b/ports/boost-hana-msvc/portfile.cmake @@ -1,5 +1,3 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 - include(vcpkg_common_functions) vcpkg_from_github( diff --git a/ports/boost-hana/CONTROL b/ports/boost-hana/CONTROL index 277954948..a64771061 100644 --- a/ports/boost-hana/CONTROL +++ b/ports/boost-hana/CONTROL @@ -1,5 +1,5 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 but has edits Source: boost-hana -Version: 1.67.0 +Version: 1.67.0-1 Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers, boost-hana-msvc (windows), boost-hana-msvc (uwp) Description: Boost hana module diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index 1ce675cf0..ef2bc9bb3 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -1,11 +1,11 @@ -# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 but has edits include(vcpkg_common_functions) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) - message("The current MSVC releases can't compile boost hana yet.") - message("Use a fork from boost 1.67 which has source workarounds instead.") - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + message("The current MSVC releases can't compile boost hana yet.") + message("Use a fork from boost 1.67 which has source workarounds instead.") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH -- cgit v1.2.3