From bda4a43535a19e5065c27645baa46281ec925f87 Mon Sep 17 00:00:00 2001 From: Voskrese <10104740+Voskrese@users.noreply.github.com> Date: Sun, 14 Jun 2020 20:40:52 +0800 Subject: [PATCH 1/9] add msys2_mingw_architecture logicexpression --- toolsrc/src/vcpkg/logicexpression.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg/logicexpression.cpp b/toolsrc/src/vcpkg/logicexpression.cpp index 5f3a25e8e90545..35b43d28da7f28 100644 --- a/toolsrc/src/vcpkg/logicexpression.cpp +++ b/toolsrc/src/vcpkg/logicexpression.cpp @@ -19,6 +19,9 @@ namespace vcpkg x86, arm, arm64, + wasm32, + mingw32, + mingw64, windows, linux, @@ -26,7 +29,7 @@ namespace vcpkg uwp, android, emscripten, - wasm32, + msys2, static_link, }; @@ -117,7 +120,11 @@ namespace vcpkg {"android", Identifier::android}, {"emscripten", Identifier::emscripten}, {"wasm32", Identifier::wasm32}, + {"msys2", Identifier::msys2}, + {"mingw32", Identifier::mingw32}, + {"mingw64", Identifier::mingw64}, {"static", Identifier::static_link}, + }; auto id_pair = id_map.find(name); @@ -171,6 +178,9 @@ 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::msys2: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "msys2"); + case Identifier::mingw32: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "mingw32"); + case Identifier::mingw64: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "mingw64"); case Identifier::static_link: return true_if_exists_and_equal("VCPKG_LIBRARY_LINKAGE", "static"); } From 91e962be9e143f6bede5ccb0aa9a8086f4c5d00e Mon Sep 17 00:00:00 2001 From: Voskrese <10104740+Voskrese@users.noreply.github.com> Date: Sun, 14 Jun 2020 20:41:30 +0800 Subject: [PATCH 2/9] add msys2_mingw_architecture control --- docs/maintainers/control-files.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/maintainers/control-files.md b/docs/maintainers/control-files.md index 43c1c70a7ab823..0a1f3495408abf 100644 --- a/docs/maintainers/control-files.md +++ b/docs/maintainers/control-files.md @@ -140,6 +140,9 @@ 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"` +- `mingw32` - `VCPKG_TARGET_ARCHITECTURE` == `"MinGW32"` +- `mingw64` - `VCPKG_TARGET_ARCHITECTURE` == `"MinGW64"` +- `msys2` - `VCPKG_CMAKE_SYSTEM_NAME` == `"MSYS2"` These predefined expressions can be overridden in the triplet file via the [`VCPKG_DEP_INFO_OVERRIDE_VARS`](../users/triplets.md) option. From f0bdd71da05c60af4a2c15402d6c81563bbe3814 Mon Sep 17 00:00:00 2001 From: Voskrese <10104740+Voskrese@users.noreply.github.com> Date: Sun, 14 Jun 2020 20:41:46 +0800 Subject: [PATCH 3/9] add msys2_mingw_architecture triplets --- docs/users/triplets.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 9aa500d76110c0..d4fe6c5dddf283 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -29,7 +29,7 @@ Community Triplets are enabled by default, when using a community triplet a mess ### VCPKG_TARGET_ARCHITECTURE Specifies the target machine architecture. -Valid options are `x86`, `x64`, `arm`, `arm64` and `wasm32`. +Valid options are `x86`, `x64`, `arm`, `arm64`, `wasm32`, `mingw32` and `mingw64`. ### VCPKG_CRT_LINKAGE Specifies the desired CRT linkage (for MSVC). @@ -50,6 +50,7 @@ Valid options include any CMake system name, such as: - `Darwin` (Mac OSX) - `Linux` (Linux) - `Emscripten` (WebAssembly) +- `MSYS2` (MSYS_NT) ### VCPKG_CMAKE_SYSTEM_VERSION Specifies the target platform system version. From 85de3a72eb767226d71cd600398b71e2ebdd3a10 Mon Sep 17 00:00:00 2001 From: Voskrese <10104740+Voskrese@users.noreply.github.com> Date: Sun, 14 Jun 2020 21:24:38 +0800 Subject: [PATCH 4/9] fix logicexpression mingw --- toolsrc/src/vcpkg/logicexpression.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/toolsrc/src/vcpkg/logicexpression.cpp b/toolsrc/src/vcpkg/logicexpression.cpp index 35b43d28da7f28..0e4332d3c26f37 100644 --- a/toolsrc/src/vcpkg/logicexpression.cpp +++ b/toolsrc/src/vcpkg/logicexpression.cpp @@ -20,8 +20,6 @@ namespace vcpkg arm, arm64, wasm32, - mingw32, - mingw64, windows, linux, @@ -29,7 +27,7 @@ namespace vcpkg uwp, android, emscripten, - msys2, + mingw, static_link, }; @@ -120,9 +118,7 @@ namespace vcpkg {"android", Identifier::android}, {"emscripten", Identifier::emscripten}, {"wasm32", Identifier::wasm32}, - {"msys2", Identifier::msys2}, - {"mingw32", Identifier::mingw32}, - {"mingw64", Identifier::mingw64}, + {"mingw", Identifier::mingw}, {"static", Identifier::static_link}, }; @@ -178,9 +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::msys2: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "msys2"); - case Identifier::mingw32: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "mingw32"); - case Identifier::mingw64: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "mingw64"); + case Identifier::mingw: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "mingw"); case Identifier::static_link: return true_if_exists_and_equal("VCPKG_LIBRARY_LINKAGE", "static"); } From e49404d5d46f3f74cfb75a222209b38eb2f282ab Mon Sep 17 00:00:00 2001 From: Voskrese <10104740+Voskrese@users.noreply.github.com> Date: Sun, 14 Jun 2020 21:26:51 +0800 Subject: [PATCH 5/9] fix triplet --- docs/users/triplets.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/users/triplets.md b/docs/users/triplets.md index d4fe6c5dddf283..50d9e030a3cd3f 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -29,7 +29,7 @@ Community Triplets are enabled by default, when using a community triplet a mess ### VCPKG_TARGET_ARCHITECTURE Specifies the target machine architecture. -Valid options are `x86`, `x64`, `arm`, `arm64`, `wasm32`, `mingw32` and `mingw64`. +Valid options are `x86`, `x64`, `arm`, `arm64` and `wasm32`. ### VCPKG_CRT_LINKAGE Specifies the desired CRT linkage (for MSVC). @@ -50,7 +50,7 @@ Valid options include any CMake system name, such as: - `Darwin` (Mac OSX) - `Linux` (Linux) - `Emscripten` (WebAssembly) -- `MSYS2` (MSYS_NT) +- `mingw` (MinGW) ### VCPKG_CMAKE_SYSTEM_VERSION Specifies the target platform system version. From 9f619ed08d6347039ccf1e6b314024a9dcfecfd1 Mon Sep 17 00:00:00 2001 From: Voskrese <10104740+Voskrese@users.noreply.github.com> Date: Sun, 14 Jun 2020 21:27:53 +0800 Subject: [PATCH 6/9] fix control --- docs/maintainers/control-files.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/maintainers/control-files.md b/docs/maintainers/control-files.md index 0a1f3495408abf..38058519d20ef7 100644 --- a/docs/maintainers/control-files.md +++ b/docs/maintainers/control-files.md @@ -140,9 +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"` -- `mingw32` - `VCPKG_TARGET_ARCHITECTURE` == `"MinGW32"` -- `mingw64` - `VCPKG_TARGET_ARCHITECTURE` == `"MinGW64"` -- `msys2` - `VCPKG_CMAKE_SYSTEM_NAME` == `"MSYS2"` +- `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. From 0bc4be4f58346aea7e64ce454aa25b89880add3f Mon Sep 17 00:00:00 2001 From: Voskrese <10104740+Voskrese@users.noreply.github.com> Date: Sun, 14 Jun 2020 21:38:56 +0800 Subject: [PATCH 7/9] fix MinGW --- docs/users/triplets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 50d9e030a3cd3f..3e3fd6b1722a3c 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -50,7 +50,7 @@ Valid options include any CMake system name, such as: - `Darwin` (Mac OSX) - `Linux` (Linux) - `Emscripten` (WebAssembly) -- `mingw` (MinGW) +- `MinGW` (Minimalist GNU for Windows) ### VCPKG_CMAKE_SYSTEM_VERSION Specifies the target platform system version. From 3e7f7b7e5080d8802d7153bf7454a570035442d0 Mon Sep 17 00:00:00 2001 From: Voskrese <10104740+Voskrese@users.noreply.github.com> Date: Sun, 14 Jun 2020 21:58:20 +0800 Subject: [PATCH 8/9] fix VCPKG_CMAKE_SYSTEM_NAME --- toolsrc/src/vcpkg/logicexpression.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg/logicexpression.cpp b/toolsrc/src/vcpkg/logicexpression.cpp index 0e4332d3c26f37..d717e406760233 100644 --- a/toolsrc/src/vcpkg/logicexpression.cpp +++ b/toolsrc/src/vcpkg/logicexpression.cpp @@ -174,7 +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_TARGET_ARCHITECTURE", "mingw"); + 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"); } From 6341cd1912bf9d9d243f1a3bdc58ee04cfd6adba Mon Sep 17 00:00:00 2001 From: Voskrese <10104740+Voskrese@users.noreply.github.com> Date: Mon, 15 Jun 2020 17:15:36 +0800 Subject: [PATCH 9/9] fix lower-upper case --- toolsrc/src/vcpkg/logicexpression.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg/logicexpression.cpp b/toolsrc/src/vcpkg/logicexpression.cpp index d717e406760233..aded18dab33a21 100644 --- a/toolsrc/src/vcpkg/logicexpression.cpp +++ b/toolsrc/src/vcpkg/logicexpression.cpp @@ -174,7 +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::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"); }