Skip to content

[mingw] add VCPKG cmake_system_name #11934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MVoz wants to merge 9 commits into from
Closed

[mingw] add VCPKG cmake_system_name #11934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bda4a43
add msys2_mingw_architecture logicexpression
MVoz Jun 14, 2020
91e962b
add msys2_mingw_architecture control
MVoz Jun 14, 2020
f0bdd71
add msys2_mingw_architecture triplets
MVoz Jun 14, 2020
85de3a7
fix logicexpression mingw
MVoz Jun 14, 2020
e49404d
fix triplet
MVoz Jun 14, 2020
9f619ed
fix control
MVoz Jun 14, 2020
0bc4be4
fix MinGW
MVoz Jun 14, 2020
3e7f7b7
fix VCPKG_CMAKE_SYSTEM_NAME
MVoz Jun 14, 2020
6341cd1
fix lower-upper case
MVoz Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/maintainers/control-files.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ The predefined expressions are computed from standard triplet settings:
- `static` - `VCPKG_LIBRARY_LINKAGE` == `"static"`
- `wasm32` - `VCPKG_TARGET_ARCHITECTURE` == `"wasm32"`
- `emscripten` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Emscripten"`
- `mingw` - `VCPKG_CMAKE_SYSTEM_NAME` == `"MinGW"`

These predefined expressions can be overridden in the triplet file via the [`VCPKG_DEP_INFO_OVERRIDE_VARS`](../users/triplets.md) option.

Expand Down
1 change: 1 addition & 0 deletions docs/users/triplets.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Valid options include any CMake system name, such as:
- `Darwin` (Mac OSX)
- `Linux` (Linux)
- `Emscripten` (WebAssembly)
- `MinGW` (Minimalist GNU for Windows)

### VCPKG_CMAKE_SYSTEM_VERSION
Specifies the target platform system version.
Expand Down
6 changes: 5 additions & 1 deletion toolsrc/src/vcpkg/logicexpression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ namespace vcpkg
x86,
arm,
arm64,
wasm32,

windows,
linux,
osx,
uwp,
android,
emscripten,
wasm32,
mingw,

static_link,
};
Expand Down Expand Up @@ -117,7 +118,9 @@ namespace vcpkg
{"android", Identifier::android},
{"emscripten", Identifier::emscripten},
{"wasm32", Identifier::wasm32},
{"mingw", Identifier::mingw},
{"static", Identifier::static_link},

};

auto id_pair = id_map.find(name);
Expand Down Expand Up @@ -171,6 +174,7 @@ namespace vcpkg
case Identifier::android: return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "Android");
case Identifier::emscripten: return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "Emscripten");
case Identifier::wasm32: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "wasm32");
case Identifier::mingw: return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "MinGW");
case Identifier::static_link: return true_if_exists_and_equal("VCPKG_LIBRARY_LINKAGE", "static");
}

Expand Down