diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-29 15:51:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-29 15:52:09 (GMT) |
| commit | 2c5862baa2b1f0a24b837bf00662bd6075384055 (patch) | |
| tree | e9e984f731fd2143a0e91152bd8ca82e076f01ee | |
| parent | 7a31aeffe86b08e5434ebabfcf199cba6d9e4223 (diff) | |
| parent | 0ad79f7ba840ae08fb67583d51f4ca5aa8d665c2 (diff) | |
| download | CMake-2c5862baa2b1f0a24b837bf00662bd6075384055.zip CMake-2c5862baa2b1f0a24b837bf00662bd6075384055.tar.gz CMake-2c5862baa2b1f0a24b837bf00662bd6075384055.tar.bz2 | |
Merge topic 'doc-vs-instance-ver'
0ad79f7ba8 Help: Fix versionadded for VS 15 2017 instance selection
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6681
| -rw-r--r-- | Help/generator/Visual Studio 15 2017.rst | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Help/generator/Visual Studio 15 2017.rst b/Help/generator/Visual Studio 15 2017.rst index a4f5f98..b4d6f6d 100644 --- a/Help/generator/Visual Studio 15 2017.rst +++ b/Help/generator/Visual Studio 15 2017.rst @@ -15,20 +15,20 @@ Powershell, Python, etc.) are not supported. Instance Selection ^^^^^^^^^^^^^^^^^^ -.. versionadded:: 3.9 - VS 2017 supports multiple installations on the same machine. - The :variable:`CMAKE_GENERATOR_INSTANCE` variable may be set as a - cache entry containing the absolute path to a Visual Studio instance. - If the value is not specified explicitly by the user or a toolchain file, - CMake queries the Visual Studio Installer to locate VS instances, chooses - one, and sets the variable as a cache entry to hold the value persistently. - .. versionadded:: 3.11 - When CMake first chooses an instance, if the ``VS150COMNTOOLS`` environment - variable is set and points to the ``Common7/Tools`` directory within - one of the instances, that instance will be used. Otherwise, if more - than one instance is installed we do not define which one is chosen - by default. + +VS 2017 supports multiple installations on the same machine. +The :variable:`CMAKE_GENERATOR_INSTANCE` variable may be set as a +cache entry containing the absolute path to a Visual Studio instance. +If the value is not specified explicitly by the user or a toolchain file, +CMake queries the Visual Studio Installer to locate VS instances, chooses +one, and sets the variable as a cache entry to hold the value persistently. + +When CMake first chooses an instance, if the ``VS150COMNTOOLS`` environment +variable is set and points to the ``Common7/Tools`` directory within +one of the instances, that instance will be used. Otherwise, if more +than one instance is installed we do not define which one is chosen +by default. Platform Selection ^^^^^^^^^^^^^^^^^^ |