diff --git a/docs/maintainers/control-files.md b/docs/maintainers/control-files.md index 43c1c70a7ab823..38058519d20ef7 100644 --- a/docs/maintainers/control-files.md +++ b/docs/maintainers/control-files.md @@ -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. diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 9aa500d76110c0..3e3fd6b1722a3c 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -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. diff --git a/toolsrc/src/vcpkg/logicexpression.cpp b/toolsrc/src/vcpkg/logicexpression.cpp index 5f3a25e8e90545..aded18dab33a21 100644 --- a/toolsrc/src/vcpkg/logicexpression.cpp +++ b/toolsrc/src/vcpkg/logicexpression.cpp @@ -19,6 +19,7 @@ namespace vcpkg x86, arm, arm64, + wasm32, windows, linux, @@ -26,7 +27,7 @@ namespace vcpkg uwp, android, emscripten, - wasm32, + mingw, static_link, }; @@ -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); @@ -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"); }