From a6257ac262f441a97869b7ec40ddc4bcce19570d Mon Sep 17 00:00:00 2001 From: Mohammed Alyousef Date: Wed, 3 Jun 2020 02:07:41 +0300 Subject: [vcpkg] add x86-wasm.cmake to community triplets (#11323) * add x86-wasm.cmake to community triplets The EMSDK enviroment variable is normally defined when first installing Emscripten. * Rename x86-wasm.cmake to wasm32-emscripten.cmake * Update wasm32-emscripten.cmake * Update wasm32-emscripten.cmake * Add wasm32 and wasm64 arch to docs * Create wasm64-emscripten.cmake * remove wasm64 * Delete wasm64-emscripten.cmake * Add wasm32 to list of identifiers * add emscripten VCPKG_CMAKE_SYSTEM_NAME support * add path check to EMSDK cmake toolchain --- toolsrc/src/vcpkg/logicexpression.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'toolsrc/src') diff --git a/toolsrc/src/vcpkg/logicexpression.cpp b/toolsrc/src/vcpkg/logicexpression.cpp index 06d949e06..5f3a25e8e 100644 --- a/toolsrc/src/vcpkg/logicexpression.cpp +++ b/toolsrc/src/vcpkg/logicexpression.cpp @@ -25,6 +25,8 @@ namespace vcpkg osx, uwp, android, + emscripten, + wasm32, static_link, }; @@ -113,6 +115,8 @@ namespace vcpkg {"osx", Identifier::osx}, {"uwp", Identifier::uwp}, {"android", Identifier::android}, + {"emscripten", Identifier::emscripten}, + {"wasm32", Identifier::wasm32}, {"static", Identifier::static_link}, }; @@ -165,6 +169,8 @@ namespace vcpkg case Identifier::osx: return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "Darwin"); case Identifier::uwp: return true_if_exists_and_equal("VCPKG_CMAKE_SYSTEM_NAME", "WindowsStore"); 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::static_link: return true_if_exists_and_equal("VCPKG_LIBRARY_LINKAGE", "static"); } -- cgit v1.2.3