diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-05-24 18:29:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-24 18:29:20 -0700 |
| commit | 9ce5c15ef97e67f61a5d5bacd934c0d9041ed4f5 (patch) | |
| tree | 4ef2bfbc9f3fdb13686d460bacf5bb7ae0496f16 | |
| parent | d511ba14d94a3e277926ac5a62b4c827ca50cec9 (diff) | |
| parent | 67f3be7bf94bcac4e6a68eff746fb96de0a79380 (diff) | |
| download | vcpkg-9ce5c15ef97e67f61a5d5bacd934c0d9041ed4f5.tar.gz vcpkg-9ce5c15ef97e67f61a5d5bacd934c0d9041ed4f5.zip | |
Merge pull request #3579 from xiangfan-ms/master
Add a new boost-hana-msvc port which allows MSVC 15.7 RTM to build boost hana
| -rw-r--r-- | ports/boost-hana-msvc/CONTROL | 4 | ||||
| -rw-r--r-- | ports/boost-hana-msvc/portfile.cmake | 12 | ||||
| -rw-r--r-- | ports/boost-hana/CONTROL | 6 | ||||
| -rw-r--r-- | ports/boost-hana/portfile.cmake | 8 |
4 files changed, 26 insertions, 4 deletions
diff --git a/ports/boost-hana-msvc/CONTROL b/ports/boost-hana-msvc/CONTROL new file mode 100644 index 000000000..0d2f178f8 --- /dev/null +++ b/ports/boost-hana-msvc/CONTROL @@ -0,0 +1,4 @@ +Source: boost-hana-msvc
+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 new file mode 100644 index 000000000..c56926499 --- /dev/null +++ b/ports/boost-hana-msvc/portfile.cmake @@ -0,0 +1,12 @@ +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..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
-Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers
+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 5a48a4e9e..ef2bc9bb3 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -1,7 +1,12 @@ -# 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)
+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()
|