diff options
| author | autoantwort <41973254+autoantwort@users.noreply.github.com> | 2021-04-08 21:04:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-08 12:04:56 -0700 |
| commit | 80d7989f7378e9163dfba8e7a93321d7fc384fc3 (patch) | |
| tree | 6e150aabd50c8fab2f0d89652d5a5fd3e84f6ae0 | |
| parent | 83f3896fc839379b85a2bf54665e14c91b7f08d0 (diff) | |
| download | vcpkg-80d7989f7378e9163dfba8e7a93321d7fc384fc3.tar.gz vcpkg-80d7989f7378e9163dfba8e7a93321d7fc384fc3.zip | |
[boost-regex] fix build with icu on osx (#16994)
* [boost-regex] fix osx build with icu
* add version files
* Update ports/boost-regex/b2-options.cmake: Apply suggestion
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* add version files
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
| -rw-r--r-- | ports/boost-regex/b2-options.cmake | 3 | ||||
| -rw-r--r-- | ports/boost-regex/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/b-/boost-regex.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/ports/boost-regex/b2-options.cmake b/ports/boost-regex/b2-options.cmake index 2ab54b7d9..ecbbcf974 100644 --- a/ports/boost-regex/b2-options.cmake +++ b/ports/boost-regex/b2-options.cmake @@ -1,3 +1,6 @@ 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")
+ if(APPLE)
+ list(APPEND B2_OPTIONS cxxstd=11)
+ endif()
endif()
diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json index a15cc3553..0bbcb88c9 100644 --- a/ports/boost-regex/vcpkg.json +++ b/ports/boost-regex/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-regex", "version-string": "1.75.0", - "port-version": 1, + "port-version": 2, "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", "dependencies": [ diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json index a7552df47..80880dcfe 100644 --- a/versions/b-/boost-regex.json +++ b/versions/b-/boost-regex.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "9b5c6faa967ec00a8f3ed0aa1bb1f82564e3e064", + "version-string": "1.75.0", + "port-version": 2 + }, + { "git-tree": "bacde176dddb776105f9b7996de34a3a051ff324", "version-string": "1.75.0", "port-version": 1 diff --git a/versions/baseline.json b/versions/baseline.json index 198aff1df..173d9601a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -846,7 +846,7 @@ }, "boost-regex": { "baseline": "1.75.0", - "port-version": 1 + "port-version": 2 }, "boost-safe-numerics": { "baseline": "1.75.0", |