diff options
| author | Nikita Nemkin <nikita@nemkin.ru> | 2020-11-10 21:48:05 (GMT) |
|---|---|---|
| committer | Nikita Nemkin <nikita@nemkin.ru> | 2020-11-12 04:45:10 (GMT) |
| commit | c43e845d0904dce126a3de31d7a903eab39a989a (patch) | |
| tree | eede43917b3e23d6f341ee501c191afae5130fdf /Help/generator/Visual Studio 15 2017.rst | |
| parent | f6fd769ae91accd6b54400b79ec797a3870cc87a (diff) | |
| download | CMake-c43e845d0904dce126a3de31d7a903eab39a989a.zip CMake-c43e845d0904dce126a3de31d7a903eab39a989a.tar.gz CMake-c43e845d0904dce126a3de31d7a903eab39a989a.tar.bz2 | |
Help: Add `.. versionadded` directives to generator docs
More `.. versionadded` could be added later when the features,
variables and properties relevant to each generator are properly
documented.
Issue: #19715
Diffstat (limited to 'Help/generator/Visual Studio 15 2017.rst')
| -rw-r--r-- | Help/generator/Visual Studio 15 2017.rst | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/Help/generator/Visual Studio 15 2017.rst b/Help/generator/Visual Studio 15 2017.rst index e7baaad..a002f2f 100644 --- a/Help/generator/Visual Studio 15 2017.rst +++ b/Help/generator/Visual Studio 15 2017.rst @@ -14,18 +14,20 @@ projects (JavaScript, Powershell, Python, etc.) are not supported. Instance Selection ^^^^^^^^^^^^^^^^^^ -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. +.. 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. Platform Selection ^^^^^^^^^^^^^^^^^^ |