diff options
Diffstat (limited to 'Help/variable')
| -rw-r--r-- | Help/variable/CMAKE_CFG_INTDIR.rst | 1 | ||||
| -rw-r--r-- | Help/variable/CMAKE_GENERATOR.rst | 2 | ||||
| -rw-r--r-- | Help/variable/CMAKE_MAKE_PROGRAM.rst | 9 | ||||
| -rw-r--r-- | Help/variable/CMAKE_MFC_FLAG.rst | 2 | ||||
| -rw-r--r-- | Help/variable/CMAKE_VS_MSDEV_COMMAND.rst | 10 |
5 files changed, 6 insertions, 18 deletions
diff --git a/Help/variable/CMAKE_CFG_INTDIR.rst b/Help/variable/CMAKE_CFG_INTDIR.rst index dcc1aed..ba25a35 100644 --- a/Help/variable/CMAKE_CFG_INTDIR.rst +++ b/Help/variable/CMAKE_CFG_INTDIR.rst @@ -12,7 +12,6 @@ Example values: :: - $(IntDir) = Visual Studio 6 $(ConfigurationName) = Visual Studio 7, 8, 9 $(Configuration) = Visual Studio 10 $(CONFIGURATION) = Xcode diff --git a/Help/variable/CMAKE_GENERATOR.rst b/Help/variable/CMAKE_GENERATOR.rst index 3f6ebc1..cce04c1 100644 --- a/Help/variable/CMAKE_GENERATOR.rst +++ b/Help/variable/CMAKE_GENERATOR.rst @@ -4,4 +4,4 @@ CMAKE_GENERATOR The generator used to build the project. See :manual:`cmake-generators(7)`. The name of the generator that is being used to generate the build -files. (e.g. ``Unix Makefiles``, ``Visual Studio 6``, etc.) +files. (e.g. ``Unix Makefiles``, ``Ninja``, etc.) diff --git a/Help/variable/CMAKE_MAKE_PROGRAM.rst b/Help/variable/CMAKE_MAKE_PROGRAM.rst index edf2732..a3b997a 100644 --- a/Help/variable/CMAKE_MAKE_PROGRAM.rst +++ b/Help/variable/CMAKE_MAKE_PROGRAM.rst @@ -34,12 +34,11 @@ to configure the project: the CMake cache then CMake will use the specified value. * The :ref:`Visual Studio Generators` set this to the full path to - ``MSBuild.exe`` (VS >= 10), ``devenv.com`` (VS 7,8,9), - ``VCExpress.exe`` (VS Express 8,9), or ``msdev.exe`` (VS 6). + ``MSBuild.exe`` (VS >= 10), ``devenv.com`` (VS 7,8,9), or + ``VCExpress.exe`` (VS Express 8,9). (See also variables - :variable:`CMAKE_VS_MSBUILD_COMMAND`, - :variable:`CMAKE_VS_DEVENV_COMMAND`, and - :variable:`CMAKE_VS_MSDEV_COMMAND`.) + :variable:`CMAKE_VS_MSBUILD_COMMAND` and + :variable:`CMAKE_VS_DEVENV_COMMAND`. These generators prefer to lookup the build tool at build time rather than to store ``CMAKE_MAKE_PROGRAM`` in the CMake cache diff --git a/Help/variable/CMAKE_MFC_FLAG.rst b/Help/variable/CMAKE_MFC_FLAG.rst index f60e7a5..1543677 100644 --- a/Help/variable/CMAKE_MFC_FLAG.rst +++ b/Help/variable/CMAKE_MFC_FLAG.rst @@ -5,7 +5,7 @@ Tell cmake to use MFC for an executable or dll. This can be set in a ``CMakeLists.txt`` file and will enable MFC in the application. It should be set to ``1`` for the static MFC library, and ``2`` -for the shared MFC library. This is used in Visual Studio 6 and 7 +for the shared MFC library. This is used in Visual Studio 7 project files. The CMakeSetup dialog used MFC and the ``CMakeLists.txt`` looks like this: diff --git a/Help/variable/CMAKE_VS_MSDEV_COMMAND.rst b/Help/variable/CMAKE_VS_MSDEV_COMMAND.rst deleted file mode 100644 index 718baaf..0000000 --- a/Help/variable/CMAKE_VS_MSDEV_COMMAND.rst +++ /dev/null @@ -1,10 +0,0 @@ -CMAKE_VS_MSDEV_COMMAND ----------------------- - -The :generator:`Visual Studio 6` generator sets this variable to the -``msdev.exe`` command installed with Visual Studio 6. - -This variable is not defined by other generators even if ``msdev.exe`` -is installed on the computer. - -See also the :variable:`CMAKE_MAKE_PROGRAM` variable. |