diff options
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/add_custom_command.rst | 2 | ||||
| -rw-r--r-- | Help/generator/Visual Studio 10 2010.rst | 54 | ||||
| -rw-r--r-- | Help/prop_tgt/VS_DEBUGGER_COMMAND.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/VS_DEBUGGER_COMMAND_ARGUMENTS.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/VS_DEBUGGER_ENVIRONMENT.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/VS_DOTNET_STARTUP_OBJECT.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/VS_KEYWORD.rst | 2 | ||||
| -rw-r--r-- | Help/release/dev/remove-vs10-generator.rst | 4 | ||||
| -rw-r--r-- | Help/variable/CMAKE_CFG_INTDIR.rst | 2 | ||||
| -rw-r--r-- | Help/variable/CMAKE_VS_DEVENV_COMMAND.rst | 2 | ||||
| -rw-r--r-- | Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst | 2 |
12 files changed, 19 insertions, 59 deletions
diff --git a/Help/command/add_custom_command.rst b/Help/command/add_custom_command.rst index 523e1b3..99adc85 100644 --- a/Help/command/add_custom_command.rst +++ b/Help/command/add_custom_command.rst @@ -436,7 +436,7 @@ one of the keywords to make clear the behavior they expect. Because generator expressions can be used in custom commands, it is possible to define ``COMMAND`` lines or whole custom commands which evaluate to empty strings for certain configurations. - For **Visual Studio 2010 (and newer)** generators these command + For **Visual Studio 11 2012 (and newer)** generators these command lines or custom commands will be omitted for the specific configuration and no "empty-string-command" will be added. diff --git a/Help/generator/Visual Studio 10 2010.rst b/Help/generator/Visual Studio 10 2010.rst index 66cd25f..ee44514 100644 --- a/Help/generator/Visual Studio 10 2010.rst +++ b/Help/generator/Visual Studio 10 2010.rst @@ -1,52 +1,8 @@ Visual Studio 10 2010 --------------------- -Deprecated. Generates Visual Studio 10 (VS 2010) project files. - -.. note:: - This generator is deprecated and will be removed in a future version - of CMake. It will still be possible to build with VS 10 2010 tools - using the :generator:`Visual Studio 11 2012` (or above) generator - with :variable:`CMAKE_GENERATOR_TOOLSET` set to ``v100``, or by - using the :generator:`NMake Makefiles` generator. - -For compatibility with CMake versions prior to 3.0, one may specify this -generator using the name ``Visual Studio 10`` without the year component. - -Project Types -^^^^^^^^^^^^^ - -Only Visual C++ and C# projects may be generated (and Fortran with -Intel compiler integration). Other types of projects (Database, -Website, etc.) are not supported. - -Platform Selection -^^^^^^^^^^^^^^^^^^ - -The default target platform name (architecture) is ``Win32``. - -.. versionadded:: 3.1 - The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set, perhaps - via the :option:`cmake -A` option, to specify a target platform - name (architecture). For example: - - * ``cmake -G "Visual Studio 10 2010" -A Win32`` - * ``cmake -G "Visual Studio 10 2010" -A x64`` - * ``cmake -G "Visual Studio 10 2010" -A Itanium`` - -For compatibility with CMake versions prior to 3.1, one may specify -a target platform name optionally at the end of the generator name. -This is supported only for: - -``Visual Studio 10 2010 Win64`` - Specify target platform ``x64``. - -``Visual Studio 10 2010 IA64`` - Specify target platform ``Itanium``. - -Toolset Selection -^^^^^^^^^^^^^^^^^ - -The ``v100`` toolset that comes with Visual Studio 10 2010 is selected by -default. The :variable:`CMAKE_GENERATOR_TOOLSET` option may be set, perhaps -via the :option:`cmake -T` option, to specify another toolset. +Removed. This once generated Visual Studio 10 2010 project files, but +the generator has been removed since CMake 3.25. It is still possible +to build with VS 10 2010 tools using the :generator:`Visual Studio 11 2012` +(or above) generator with :variable:`CMAKE_GENERATOR_TOOLSET` set to +``v100``, or by using the :generator:`NMake Makefiles` generator. diff --git a/Help/prop_tgt/VS_DEBUGGER_COMMAND.rst b/Help/prop_tgt/VS_DEBUGGER_COMMAND.rst index 58476d6..1e84c00 100644 --- a/Help/prop_tgt/VS_DEBUGGER_COMMAND.rst +++ b/Help/prop_tgt/VS_DEBUGGER_COMMAND.rst @@ -9,5 +9,5 @@ The property value may use This is defined in ``<LocalDebuggerCommand>`` in the Visual Studio project file. -This property only works for Visual Studio 2010 and above; +This property only works for Visual Studio 11 2012 and above; it is ignored on other generators. diff --git a/Help/prop_tgt/VS_DEBUGGER_COMMAND_ARGUMENTS.rst b/Help/prop_tgt/VS_DEBUGGER_COMMAND_ARGUMENTS.rst index 6c26601..e54e140 100644 --- a/Help/prop_tgt/VS_DEBUGGER_COMMAND_ARGUMENTS.rst +++ b/Help/prop_tgt/VS_DEBUGGER_COMMAND_ARGUMENTS.rst @@ -9,5 +9,5 @@ The property value may use This is defined in ``<LocalDebuggerCommandArguments>`` in the Visual Studio project file. -This property only works for Visual Studio 2010 and above; +This property only works for Visual Studio 11 2012 and above; it is ignored on other generators. diff --git a/Help/prop_tgt/VS_DEBUGGER_ENVIRONMENT.rst b/Help/prop_tgt/VS_DEBUGGER_ENVIRONMENT.rst index 2f59a82..60bc2f0 100644 --- a/Help/prop_tgt/VS_DEBUGGER_ENVIRONMENT.rst +++ b/Help/prop_tgt/VS_DEBUGGER_ENVIRONMENT.rst @@ -9,5 +9,5 @@ The property value may use This is defined in ``<LocalDebuggerEnvironment>`` in the Visual Studio project file. -This property only works for Visual Studio 2010 and above; +This property only works for Visual Studio 11 2012 and above; it is ignored on other generators. diff --git a/Help/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.rst b/Help/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.rst index c163abf..f9ce7aa 100644 --- a/Help/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.rst +++ b/Help/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.rst @@ -9,5 +9,5 @@ The property value may use This is defined in ``<LocalDebuggerWorkingDirectory>`` in the Visual Studio project file. -This property only works for Visual Studio 2010 and above; +This property only works for Visual Studio 11 2012 and above; it is ignored on other generators. diff --git a/Help/prop_tgt/VS_DOTNET_STARTUP_OBJECT.rst b/Help/prop_tgt/VS_DOTNET_STARTUP_OBJECT.rst index 5212293..8a85ba4 100644 --- a/Help/prop_tgt/VS_DOTNET_STARTUP_OBJECT.rst +++ b/Help/prop_tgt/VS_DOTNET_STARTUP_OBJECT.rst @@ -12,7 +12,7 @@ If the property is unset, Visual Studio uses the first matching than one ``Main()`` method is available in the current project, the property becomes mandatory for building the project. -This property only works for Visual Studio 2010 and above; +This property only works for Visual Studio 11 2012 and above; it is ignored on other generators. .. code-block:: cmake diff --git a/Help/prop_tgt/VS_KEYWORD.rst b/Help/prop_tgt/VS_KEYWORD.rst index 6c2e042..221b986 100644 --- a/Help/prop_tgt/VS_KEYWORD.rst +++ b/Help/prop_tgt/VS_KEYWORD.rst @@ -7,4 +7,4 @@ Can be set to change the visual studio keyword, for example Qt integration works better if this is set to Qt4VSv1.0. Use the :prop_tgt:`VS_GLOBAL_KEYWORD` target property to set the -keyword for Visual Studio 10 (2010) and newer. +keyword for Visual Studio 11 (2012) and newer. diff --git a/Help/release/dev/remove-vs10-generator.rst b/Help/release/dev/remove-vs10-generator.rst new file mode 100644 index 0000000..32e1da6 --- /dev/null +++ b/Help/release/dev/remove-vs10-generator.rst @@ -0,0 +1,4 @@ +remove-vs10-generator +--------------------- + +* The :generator:`Visual Studio 10 2010` generator has been removed. diff --git a/Help/variable/CMAKE_CFG_INTDIR.rst b/Help/variable/CMAKE_CFG_INTDIR.rst index 43668ea..3a57659 100644 --- a/Help/variable/CMAKE_CFG_INTDIR.rst +++ b/Help/variable/CMAKE_CFG_INTDIR.rst @@ -19,7 +19,7 @@ Example values: :: $(ConfigurationName) = Visual Studio 9 - $(Configuration) = Visual Studio 10 + $(Configuration) = Visual Studio 11 and above $(CONFIGURATION) = Xcode . = Make-based tools . = Ninja diff --git a/Help/variable/CMAKE_VS_DEVENV_COMMAND.rst b/Help/variable/CMAKE_VS_DEVENV_COMMAND.rst index f109a9e..2bb97c4 100644 --- a/Help/variable/CMAKE_VS_DEVENV_COMMAND.rst +++ b/Help/variable/CMAKE_VS_DEVENV_COMMAND.rst @@ -10,5 +10,5 @@ This variable is not defined by other generators even if ``devenv.com`` is installed on the computer. The :variable:`CMAKE_VS_MSBUILD_COMMAND` is also provided for -:generator:`Visual Studio 10 2010` and above. +:generator:`Visual Studio 11 2012` and above. See also the :variable:`CMAKE_MAKE_PROGRAM` variable. diff --git a/Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst b/Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst index 58f2bef..8a521a3 100644 --- a/Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst +++ b/Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst @@ -1,7 +1,7 @@ CMAKE_VS_MSBUILD_COMMAND ------------------------ -The generators for :generator:`Visual Studio 10 2010` and above set this +The generators for :generator:`Visual Studio 11 2012` and above set this variable to the ``MSBuild.exe`` command installed with the corresponding Visual Studio version. |