aboutsummaryrefslogtreecommitdiff
path: root/ports/boost-regex
diff options
context:
space:
mode:
authoryurybura <yurybura@gmail.com>2020-05-13 20:26:05 +0300
committerGitHub <noreply@github.com>2020-05-13 10:26:05 -0700
commit24e8be5fcfddd0da98b58a63cd918849787fb06f (patch)
tree328e0bd25684f1392419547c1b3360e06ba5845b /ports/boost-regex
parent597038559647776ee39d02dcf159da05d9342f1d (diff)
downloadvcpkg-24e8be5fcfddd0da98b58a63cd918849787fb06f.tar.gz
vcpkg-24e8be5fcfddd0da98b58a63cd918849787fb06f.zip
[boost] update to 1.73.0 (#11221)
* [boost] update to 1.73 * [ompl] remove dependency to boost-disjoint-sets * [libtorrent] include fixes from RC_1_2 branch * [liblas] fix boost headers * [freeopcua] fix std headers * [pcl] fix build with Boost 1.73.0 * [hpx] fix build with Boost 1.73.0 * [libmysql] fix conflict with C++20 header <version> * [boost-modular-build-helper] move port-specific b2 options to the file `<port_dir>/b2-options.cmake` [boost-python] support Python2 (fixes #3495) * [boost-python] remove Python executable from user-config * [libtorrent] update version after merge * [libtorrent] add boost-variant dependency
Diffstat (limited to 'ports/boost-regex')
-rw-r--r--ports/boost-regex/CONTROL4
-rw-r--r--ports/boost-regex/b2-options.cmake3
-rw-r--r--ports/boost-regex/portfile.cmake17
3 files changed, 11 insertions, 13 deletions
diff --git a/ports/boost-regex/CONTROL b/ports/boost-regex/CONTROL
index d3acd2daa..16d9feafc 100644
--- a/ports/boost-regex/CONTROL
+++ b/ports/boost-regex/CONTROL
@@ -1,10 +1,10 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-regex
-Version: 1.72.0
+Version: 1.73.0
Build-Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-predef, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/regex
Description: Boost regex module
Feature: icu
-Description: ICU backend for Boost.Regex
Build-Depends: icu
+Description: ICU backend for Boost.Regex
diff --git a/ports/boost-regex/b2-options.cmake b/ports/boost-regex/b2-options.cmake
new file mode 100644
index 000000000..2ab54b7d9
--- /dev/null
+++ b/ports/boost-regex/b2-options.cmake
@@ -0,0 +1,3 @@
+if("icu" IN_LIST FEATURES)
+ set(B2_REQUIREMENTS "<library>/user-config//icuuc <library>/user-config//icudt <library>/user-config//icuin <define>BOOST_HAS_ICU=1")
+endif()
diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake
index adb7f05b5..7ef90f0f0 100644
--- a/ports/boost-regex/portfile.cmake
+++ b/ports/boost-regex/portfile.cmake
@@ -1,22 +1,17 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/regex
- REF boost-1.72.0
- SHA512 a5026e5c992698d6a41baee9e64ee3751eafc6aeba9aa79b90b62e5806185d0c230a08aaceaa89929c8fd0c3f36c1f1c54a9b9734eff3c11a34a4c9d1684a193
+ REF boost-1.73.0
+ SHA512 4ff9559b925a4901bc98762ed0fa21fe19f27bdf3c49932285bac830d52ddcb0d3e3d3197581b655bc0ed720916d9d2242ace4567cc4d457d0eafdd822114418
HEAD_REF master
)
-if("icu" IN_LIST FEATURES)
- set(REQUIREMENTS "<library>/user-config//icuuc <library>/user-config//icudt <library>/user-config//icuin <define>BOOST_HAS_ICU=1")
-else()
- set(REQUIREMENTS)
-endif()
-
include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
-boost_modular_build(SOURCE_PATH ${SOURCE_PATH} REQUIREMENTS "${REQUIREMENTS}")
+boost_modular_build(
+ SOURCE_PATH ${SOURCE_PATH}
+ BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake"
+)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})