diff options
| author | Mohammed Alyousef <may642_2000@hotmail.com> | 2020-06-03 02:07:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-02 16:07:41 -0700 |
| commit | a6257ac262f441a97869b7ec40ddc4bcce19570d (patch) | |
| tree | 62551e72a5b01b9cd02147cc7faf9d61cabd56e1 /docs | |
| parent | ad7a22732938a6df5abf7f04dbdbe3fee15af296 (diff) | |
| download | vcpkg-a6257ac262f441a97869b7ec40ddc4bcce19570d.tar.gz vcpkg-a6257ac262f441a97869b7ec40ddc4bcce19570d.zip | |
[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
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/maintainers/control-files.md | 2 | ||||
| -rw-r--r-- | docs/users/triplets.md | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/maintainers/control-files.md b/docs/maintainers/control-files.md index 87468e6af..ea44c2b8a 100644 --- a/docs/maintainers/control-files.md +++ b/docs/maintainers/control-files.md @@ -138,6 +138,8 @@ The predefined expressions are computed from standard triplet settings: - `osx` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Darwin"` - `android` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Android"` - `static` - `VCPKG_LIBRARY_LINKAGE` == `"static"` +- `wasm32` - `VCPKG_TARGET_ARCHITECTURE` == `"wasm32"` +- `emscripten` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Emscripten"` 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 aafae0920..9aa500d76 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`, and `arm64`. +Valid options are `x86`, `x64`, `arm`, `arm64` and `wasm32`. ### VCPKG_CRT_LINKAGE Specifies the desired CRT linkage (for MSVC). @@ -49,6 +49,7 @@ Valid options include any CMake system name, such as: - `WindowsStore` (Universal Windows Platform) - `Darwin` (Mac OSX) - `Linux` (Linux) +- `Emscripten` (WebAssembly) ### VCPKG_CMAKE_SYSTEM_VERSION Specifies the target platform system version. |