3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[boost-modular-build-helper] Fix x86 MinGW build (#27955)

Browse Source
This commit is contained in:
Todor Prokopov 2022-11-23 20:07:20 +02:00 committed by GitHub
parent c889853f7b
commit 2705bcd229
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/boost-modular-build-helper/CMakeLists.txt
View File

@ -48,11 +48,11 @@ else()
list(APPEND B2_OPTIONS architecture=x86) list(APPEND B2_OPTIONS architecture=x86)
endif() endif()
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND WIN32)
list(APPEND B2_OPTIONS "asmflags=/safeseh")
endif()
if(VCPKG_DETECTED_MSVC) if(VCPKG_DETECTED_MSVC)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
list(APPEND B2_OPTIONS "asmflags=/safeseh")
endif()
if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "Clang") if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(USER_CONFIG_TOOLSET clang-win) set(USER_CONFIG_TOOLSET clang-win)
else() else()

2
ports/boost-modular-build-helper/vcpkg.json
View File

@ -2,7 +2,7 @@
"$comment": "When changing this file also update and run scripts/boost/generate-ports.ps1", "$comment": "When changing this file also update and run scripts/boost/generate-ports.ps1",
"name": "boost-modular-build-helper", "name": "boost-modular-build-helper",
"version": "1.80.0", "version": "1.80.0",
"port-version": 3, "port-version": 4,
"description": "Internal vcpkg port used to build Boost libraries", "description": "Internal vcpkg port used to build Boost libraries",
"license": "MIT", "license": "MIT",
"dependencies": [ "dependencies": [

2
scripts/boost/generate-ports.ps1
View File

@ -99,7 +99,7 @@ $portVersions = @{
"boost-logic" = 1; "boost-logic" = 1;
"boost-math" = 1; "boost-math" = 1;
"boost-metaparse" = 1; "boost-metaparse" = 1;
"boost-modular-build-helper" = 3; "boost-modular-build-helper" = 4;
"boost-move" = 1; "boost-move" = 1;
"boost-mp11" = 1; "boost-mp11" = 1;
"boost-mpi" = 1; "boost-mpi" = 1;

5
versions/b-/boost-modular-build-helper.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "0631e980f0a18e2175424e672b55709b84e19aa3",
"version": "1.80.0",
"port-version": 4
},
{ {
"git-tree": "4a8c162e2661795b998a8435b6ec7207608fe73a", "git-tree": "4a8c162e2661795b998a8435b6ec7207608fe73a",
"version": "1.80.0", "version": "1.80.0",

2
versions/baseline.json
View File

@ -862,7 +862,7 @@
}, },
"boost-modular-build-helper": { "boost-modular-build-helper": {
"baseline": "1.80.0", "baseline": "1.80.0",
"port-version": 3 "port-version": 4
}, },
"boost-move": { "boost-move": {
"baseline": "1.80.0", "baseline": "1.80.0",