From 5e40afca0d7286a9a7d742822cc2a1179a9e63fc Mon Sep 17 00:00:00 2001 From: Jonathan Hale Date: Tue, 14 Jul 2020 17:38:18 +0200 Subject: [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 (#12211) * [magnum] Improve maintainability of feature to cmake flag conversion * [magnum] Ignore features not supported on current platform Allows `vcpkg install magnum[*]` on any platform. Signed-off-by: Squareys * [magnum] Add cglcontext and windowlesscglapplication features * docs: Update valid VCPKG_CMAKE_SYSTEM_NAME values Signed-off-by: Squareys * [magnum-plugins] Replace deprecated basisu with archive download Signed-off-by: Squareys * [magnum-plugins] Add meshoptimizersceneconverter feature Signed-off-by: Squareys * [magnum-plugins] Also use vcpkg_check_features Analog to magnum port. Signed-off-by: Squareys * [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 Signed-off-by: Squareys * [meshoptimizer] Add initial port Signed-off-by: Squareys * [magnum-plugins] Replace meshoptimizer download with feature dependency Signed-off-by: Squareys * [corrade,magnum-*] Fix license installation command Signed-off-by: Squareys * [meshoptimizer] Use vcpkg_fixup_cmake_targets Co-authored-by: Robert Schumacher --- docs/users/triplets.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 9aa500d76..10ac31fd5 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -47,7 +47,9 @@ Specifies the target platform. Valid options include any CMake system name, such as: - Empty (Windows Desktop for legacy reasons) - `WindowsStore` (Universal Windows Platform) +- `MinGW` (Minimalist GNU for Windows) - `Darwin` (Mac OSX) +- `iOS` (iOS) - `Linux` (Linux) - `Emscripten` (WebAssembly) @@ -127,7 +129,7 @@ Valid settings: * The Visual Studio 2015 platform toolset is `v140`. ### VCPKG_LOAD_VCVARS_ENV -If `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` is used, VCPKG will not setup the Visual Studio environment. +If `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` is used, VCPKG will not setup the Visual Studio environment. Setting `VCPKG_LOAD_VCVARS_ENV` to (true|1|on) changes this behavior so that the Visual Studio environment is setup following the same rules as if `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` was not set. ## MacOS Variables -- cgit v1.2.3