Skip to content

Commit

Permalink
[boost-regex] Fix icu feature (#25505)
Browse files Browse the repository at this point in the history
Explicitly disable icu feature if not selected in vcpkg

Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
  • Loading branch information
3 people committed Jul 7, 2022
1 parent fb3190d commit 5955c45
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions ports/boost-regex/b2-options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ if("icu" IN_LIST FEATURES)
if(APPLE)
list(APPEND B2_OPTIONS cxxstd=11)
endif()
else()
list(APPEND B2_OPTIONS --disable-icu)
endif()
1 change: 1 addition & 0 deletions ports/boost-regex/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "boost-regex",
"version": "1.79.0",
"port-version": 1,
"description": "Boost regex module",
"homepage": "https://github.com/boostorg/regex",
"license": "BSL-1.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/boost-regex.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "49b26b133e2b9eb16d917930b2c697b58eff5530",
"version": "1.79.0",
"port-version": 1
},
{
"git-tree": "a10bdc49cf30856030ed08921a5a30f3c3f3bdb1",
"version": "1.79.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@
},
"boost-regex": {
"baseline": "1.79.0",
"port-version": 0
"port-version": 1
},
"boost-safe-numerics": {
"baseline": "1.79.0",
Expand Down

0 comments on commit 5955c45

Please sign in to comment.