reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-16 16:16:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-master

Browse Source
This commit is contained in:
Brad King 2016-11-29 10:50:08 -05:00
commit 31e013ae60
5 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Help/generator/Visual Studio 15.rst → Help/generator/Visual Studio 15 2017.rst
View File

@ -1,7 +1,7 @@
Visual Studio 15
----------------
Visual Studio 15 2017
---------------------
Generates Visual Studio 15 project files.
Generates Visual Studio 15 (VS 2017) project files.
The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set
to specify a target platform name (architecture).
@ -9,16 +9,16 @@ to specify a target platform name (architecture).
For compatibility with CMake versions prior to 3.1, one may specify
a target platform name optionally at the end of this generator name:
``Visual Studio 15 Win64``
``Visual Studio 15 2017 Win64``
Specify target platform ``x64``.
``Visual Studio 15 ARM``
``Visual Studio 15 2017 ARM``
Specify target platform ``ARM``.
Toolset Selection
^^^^^^^^^^^^^^^^^
The ``v141`` toolset that comes with Visual Studio 15 is selected by
The ``v141`` toolset that comes with Visual Studio 15 2017 is selected by
default. The :variable:`CMAKE_GENERATOR_TOOLSET` option may be set, perhaps
via the :manual:`cmake(1)` ``-T`` option, to specify another toolset.

2
Help/manual/cmake-generators.7.rst
View File

@ -82,7 +82,7 @@ Visual Studio Generators
/generator/Visual Studio 11 2012
/generator/Visual Studio 12 2013
/generator/Visual Studio 14 2015
/generator/Visual Studio 15
/generator/Visual Studio 15 2017
Other Generators
^^^^^^^^^^^^^^^^

6
Help/release/3.7.rst
View File

@ -31,9 +31,9 @@ Generators
This is equivalent to ``cd sub/dir; make {test,install,package}``
with :ref:`Makefile Generators`.
* The :generator:`Visual Studio 15` generator was added. This is
experimental and based on Preview 5 because this version of VS
has not been released.
* The :generator:`Visual Studio 15 2017` generator was added. This is
experimental and based on "Visual Studio 2017 RC" because this version
of VS has not been released.
* :ref:`Visual Studio Generators` for VS 2010 and above learned to
place ``.natvis`` source files into VS project files properly.

11
Source/cmGlobalVisualStudio15Generator.cxx
View File

@ -8,16 +8,19 @@
#include "cmMakefile.h"
#include "cmVS141CLFlagTable.h"
static const char vs15generatorName[] = "Visual Studio 15";
static const char vs15generatorName[] = "Visual Studio 15 2017";
// Map generator name without year to name with year.
static const char* cmVS15GenName(const std::string& name, std::string& genName)
{
if (strncmp(name.c_str(), vs15generatorName,
sizeof(vs15generatorName) - 1) != 0) {
sizeof(vs15generatorName) - 6) != 0) {
return 0;
}
const char* p = name.c_str() + sizeof(vs15generatorName) - 1;
const char* p = name.c_str() + sizeof(vs15generatorName) - 6;
if (cmHasLiteralPrefix(p, " 2017")) {
p += 5;
}
genName = std::string(vs15generatorName) + p;
return p;
}
@ -52,7 +55,7 @@ public:
virtual void GetDocumentation(cmDocumentationEntry& entry) const
{
entry.Name = std::string(vs15generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 15 project files. "
entry.Brief = "Generates Visual Studio 2017 project files. "
"Optional [arch] can be \"Win64\" or \"ARM\".";
}

2
Source/cmake.cxx
View File

@ -1457,7 +1457,7 @@ void cmake::CreateDefaultGlobalGenerator()
const char* GeneratorName;
};
static VSVersionedGenerator const vsGenerators[] = {
{ "15.0", "Visual Studio 15" }, //
{ "15.0", "Visual Studio 15 2017" }, //
{ "14.0", "Visual Studio 14 2015" }, //
{ "12.0", "Visual Studio 12 2013" }, //
{ "11.0", "Visual Studio 11 2012" }, //