diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-18 13:01:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-18 13:01:48 (GMT) |
| commit | b34b4c5eac27bfc4a1e46f2b46ba17f5be6a8565 (patch) | |
| tree | cca98eb61f39604776d35cf96dc78872246a8f8b /Help | |
| parent | c867981c9d9bc8548d34f726940cd50b8d05d71c (diff) | |
| parent | e7d57bc3c35e7c47746caf91591ef748b9ce3012 (diff) | |
| download | CMake-b34b4c5eac27bfc4a1e46f2b46ba17f5be6a8565.zip CMake-b34b4c5eac27bfc4a1e46f2b46ba17f5be6a8565.tar.gz CMake-b34b4c5eac27bfc4a1e46f2b46ba17f5be6a8565.tar.bz2 | |
Merge topic 'vs-vctargetspath'
e7d57bc3c3 VS: Propagate CMAKE_VS_GLOBALS into custom targets
45b4b4b930 VS: Propagate CMAKE_VS_GLOBALS into compiler id projects
548e9051a4 VS: Add support to override VCTargetsPath through toolset
99e83d4235 cmake: Teach --build mode to load CMAKE_GENERATOR_TOOLSET
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3817
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/release/dev/vs-vctargetspath.rst | 10 | ||||
| -rw-r--r-- | Help/variable/CMAKE_GENERATOR_TOOLSET.rst | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/Help/release/dev/vs-vctargetspath.rst b/Help/release/dev/vs-vctargetspath.rst new file mode 100644 index 0000000..d40af34 --- /dev/null +++ b/Help/release/dev/vs-vctargetspath.rst @@ -0,0 +1,10 @@ +vs-vctargetspath +---------------- + +* With :ref:`Visual Studio Generators` for VS 2010 and above, + the :variable:`CMAKE_GENERATOR_TOOLSET` setting gained an option + to specify the ``VCTargetsPath`` value for project files. + +* The :variable:`CMAKE_VS_GLOBALS` variable value now applies during + compiler identification and in targets created by the + :command:`add_custom_target` command. diff --git a/Help/variable/CMAKE_GENERATOR_TOOLSET.rst b/Help/variable/CMAKE_GENERATOR_TOOLSET.rst index 222824f..53ad2f3 100644 --- a/Help/variable/CMAKE_GENERATOR_TOOLSET.rst +++ b/Help/variable/CMAKE_GENERATOR_TOOLSET.rst @@ -58,3 +58,8 @@ Supported pairs are: Specify the toolset version to use. Supported by VS 2017 and above with the specified toolset installed. See the :variable:`CMAKE_VS_PLATFORM_TOOLSET_VERSION` variable. + +``VCTargetsPath=<path>`` + Specify an alternative ``VCTargetsPath`` value for Visual Studio + project files. This allows use of VS platform extension configuration + files (``.props`` and ``.targets``) that are not installed with VS. |