VS15: Add Visual Studio 15 generator
Call the generator "Visual Studio 15" without any year because the preview version of VS 15 does not provide a year in the product name. Copy cmGlobalVisualStudio14Generator to cmGlobalVisualStudio15Generator and update version numbers accordingly. Add the VS15 enumeration value. Note that we do not need to add a MSVC15 variable or v150 toolset because Visual Studio 15 comes with an updated version of the v140 toolset and remains ABI-compatible. Teach tests VSExternalInclude, RunCMake.GeneratorPlatform, and RunCMake.GeneratorToolset to treat VS 15 as they do VS 10-14. Closes: #16143
This commit is contained in:
parent
a8936656fa
commit
bdc679a8ae
|
@ -0,0 +1,16 @@
|
|||
Visual Studio 15
|
||||
----------------
|
||||
|
||||
Generates Visual Studio 15 project files.
|
||||
|
||||
The :variable:`CMAKE_GENERATOR_PLATFORM` variable may be set
|
||||
to specify a target platform name.
|
||||
|
||||
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``
|
||||
Specify target platform ``x64``.
|
||||
|
||||
``Visual Studio 15 ARM``
|
||||
Specify target platform ``ARM``.
|
|
@ -82,6 +82,7 @@ Visual Studio Generators
|
|||
/generator/Visual Studio 11 2012
|
||||
/generator/Visual Studio 12 2013
|
||||
/generator/Visual Studio 14 2015
|
||||
/generator/Visual Studio 15
|
||||
|
||||
Other Generators
|
||||
^^^^^^^^^^^^^^^^
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
vs-15-generator
|
||||
---------------
|
||||
|
||||
* The :generator:`Visual Studio 15` generator was added.
|
|
@ -13,4 +13,4 @@ Known version numbers are::
|
|||
1600 = VS 10.0
|
||||
1700 = VS 11.0
|
||||
1800 = VS 12.0
|
||||
1900 = VS 14.0
|
||||
1900 = VS 14.0, 15.0
|
||||
|
|
|
@ -492,6 +492,8 @@ if (WIN32)
|
|||
cmGlobalVisualStudio12Generator.cxx
|
||||
cmGlobalVisualStudio14Generator.h
|
||||
cmGlobalVisualStudio14Generator.cxx
|
||||
cmGlobalVisualStudio15Generator.h
|
||||
cmGlobalVisualStudio15Generator.cxx
|
||||
cmGlobalVisualStudioGenerator.cxx
|
||||
cmGlobalVisualStudioGenerator.h
|
||||
cmIDEFlagTable.h
|
||||
|
|
|
@ -365,6 +365,20 @@ std::string cmGlobalVisualStudio10Generator::FindMSBuildCommand()
|
|||
}
|
||||
}
|
||||
|
||||
// Search where VS15Preview places it.
|
||||
mskey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7;";
|
||||
mskey += this->GetIDEVersion();
|
||||
if (cmSystemTools::ReadRegistryValue(mskey.c_str(), msbuild,
|
||||
cmSystemTools::KeyWOW64_32)) {
|
||||
cmSystemTools::ConvertToUnixSlashes(msbuild);
|
||||
msbuild += "/MSBuild/";
|
||||
msbuild += this->GetIDEVersion();
|
||||
msbuild += "/Bin/MSBuild.exe";
|
||||
if (cmSystemTools::FileExists(msbuild, true)) {
|
||||
return msbuild;
|
||||
}
|
||||
}
|
||||
|
||||
msbuild = "MSBuild.exe";
|
||||
return msbuild;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,151 @@
|
|||
/*============================================================================
|
||||
CMake - Cross Platform Makefile Generator
|
||||
Copyright 2000-2016 Kitware, Inc., Insight Software Consortium
|
||||
|
||||
Distributed under the OSI-approved BSD License (the "License");
|
||||
see accompanying file Copyright.txt for details.
|
||||
|
||||
This software is distributed WITHOUT ANY WARRANTY; without even the
|
||||
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
See the License for more information.
|
||||
============================================================================*/
|
||||
#include "cmGlobalVisualStudio15Generator.h"
|
||||
|
||||
#include "cmAlgorithms.h"
|
||||
#include "cmLocalVisualStudio10Generator.h"
|
||||
#include "cmMakefile.h"
|
||||
|
||||
static const char vs15generatorName[] = "Visual Studio 15";
|
||||
|
||||
// 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) {
|
||||
return 0;
|
||||
}
|
||||
const char* p = name.c_str() + sizeof(vs15generatorName) - 1;
|
||||
genName = std::string(vs15generatorName) + p;
|
||||
return p;
|
||||
}
|
||||
|
||||
class cmGlobalVisualStudio15Generator::Factory
|
||||
: public cmGlobalGeneratorFactory
|
||||
{
|
||||
public:
|
||||
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
|
||||
cmake* cm) const
|
||||
{
|
||||
std::string genName;
|
||||
const char* p = cmVS15GenName(name, genName);
|
||||
if (!p) {
|
||||
return 0;
|
||||
}
|
||||
if (!*p) {
|
||||
return new cmGlobalVisualStudio15Generator(cm, genName, "");
|
||||
}
|
||||
if (*p++ != ' ') {
|
||||
return 0;
|
||||
}
|
||||
if (strcmp(p, "Win64") == 0) {
|
||||
return new cmGlobalVisualStudio15Generator(cm, genName, "x64");
|
||||
}
|
||||
if (strcmp(p, "ARM") == 0) {
|
||||
return new cmGlobalVisualStudio15Generator(cm, genName, "ARM");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
virtual void GetDocumentation(cmDocumentationEntry& entry) const
|
||||
{
|
||||
entry.Name = std::string(vs15generatorName) + " [arch]";
|
||||
entry.Brief = "Generates Visual Studio 15 project files. "
|
||||
"Optional [arch] can be \"Win64\" or \"ARM\".";
|
||||
}
|
||||
|
||||
virtual void GetGenerators(std::vector<std::string>& names) const
|
||||
{
|
||||
names.push_back(vs15generatorName);
|
||||
names.push_back(vs15generatorName + std::string(" ARM"));
|
||||
names.push_back(vs15generatorName + std::string(" Win64"));
|
||||
}
|
||||
|
||||
bool SupportsToolset() const CM_OVERRIDE { return true; }
|
||||
bool SupportsPlatform() const CM_OVERRIDE { return true; }
|
||||
};
|
||||
|
||||
cmGlobalGeneratorFactory* cmGlobalVisualStudio15Generator::NewFactory()
|
||||
{
|
||||
return new Factory;
|
||||
}
|
||||
|
||||
cmGlobalVisualStudio15Generator::cmGlobalVisualStudio15Generator(
|
||||
cmake* cm, const std::string& name, const std::string& platformName)
|
||||
: cmGlobalVisualStudio14Generator(cm, name, platformName)
|
||||
{
|
||||
std::string vc15Express;
|
||||
this->ExpressEdition = cmSystemTools::ReadRegistryValue(
|
||||
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\15.0\\Setup\\VC;"
|
||||
"ProductDir",
|
||||
vc15Express, cmSystemTools::KeyWOW64_32);
|
||||
this->DefaultPlatformToolset = "v140";
|
||||
this->Version = VS15;
|
||||
}
|
||||
|
||||
bool cmGlobalVisualStudio15Generator::MatchesGeneratorName(
|
||||
const std::string& name) const
|
||||
{
|
||||
std::string genName;
|
||||
if (cmVS15GenName(name, genName)) {
|
||||
return genName == this->GetName();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void cmGlobalVisualStudio15Generator::WriteSLNHeader(std::ostream& fout)
|
||||
{
|
||||
// Visual Studio 15 writes .sln format 12.00
|
||||
fout << "Microsoft Visual Studio Solution File, Format Version 12.00\n";
|
||||
if (this->ExpressEdition) {
|
||||
fout << "# Visual Studio Express 15 for Windows Desktop\n";
|
||||
} else {
|
||||
fout << "# Visual Studio 15\n";
|
||||
}
|
||||
}
|
||||
|
||||
bool cmGlobalVisualStudio15Generator::SelectWindowsStoreToolset(
|
||||
std::string& toolset) const
|
||||
{
|
||||
if (cmHasLiteralPrefix(this->SystemVersion, "10.0")) {
|
||||
if (this->IsWindowsStoreToolsetInstalled() &&
|
||||
this->IsWindowsDesktopToolsetInstalled()) {
|
||||
toolset = "v140"; // VS 15 uses v140 toolset
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return this->cmGlobalVisualStudio14Generator::SelectWindowsStoreToolset(
|
||||
toolset);
|
||||
}
|
||||
|
||||
bool cmGlobalVisualStudio15Generator::IsWindowsDesktopToolsetInstalled() const
|
||||
{
|
||||
const char desktop10Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
|
||||
"VisualStudio\\15.0\\VC\\Runtimes";
|
||||
|
||||
std::vector<std::string> vc15;
|
||||
return cmSystemTools::GetRegistrySubKeys(desktop10Key, vc15,
|
||||
cmSystemTools::KeyWOW64_32);
|
||||
}
|
||||
|
||||
bool cmGlobalVisualStudio15Generator::IsWindowsStoreToolsetInstalled() const
|
||||
{
|
||||
const char universal10Key[] =
|
||||
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
|
||||
"VisualStudio\\15.0\\Setup\\Build Tools for Windows 10;SrcPath";
|
||||
|
||||
std::string win10SDK;
|
||||
return cmSystemTools::ReadRegistryValue(universal10Key, win10SDK,
|
||||
cmSystemTools::KeyWOW64_32);
|
||||
}
|
|
@ -0,0 +1,46 @@
|
|||
/*============================================================================
|
||||
CMake - Cross Platform Makefile Generator
|
||||
Copyright 2000-2016 Kitware, Inc., Insight Software Consortium
|
||||
|
||||
Distributed under the OSI-approved BSD License (the "License");
|
||||
see accompanying file Copyright.txt for details.
|
||||
|
||||
This software is distributed WITHOUT ANY WARRANTY; without even the
|
||||
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
See the License for more information.
|
||||
============================================================================*/
|
||||
#ifndef cmGlobalVisualStudio15Generator_h
|
||||
#define cmGlobalVisualStudio15Generator_h
|
||||
|
||||
#include "cmGlobalVisualStudio14Generator.h"
|
||||
|
||||
/** \class cmGlobalVisualStudio15Generator */
|
||||
class cmGlobalVisualStudio15Generator : public cmGlobalVisualStudio14Generator
|
||||
{
|
||||
public:
|
||||
cmGlobalVisualStudio15Generator(cmake* cm, const std::string& name,
|
||||
const std::string& platformName);
|
||||
static cmGlobalGeneratorFactory* NewFactory();
|
||||
|
||||
virtual bool MatchesGeneratorName(const std::string& name) const;
|
||||
|
||||
virtual void WriteSLNHeader(std::ostream& fout);
|
||||
|
||||
virtual const char* GetToolsVersion() { return "15.0"; }
|
||||
protected:
|
||||
virtual bool SelectWindowsStoreToolset(std::string& toolset) const;
|
||||
|
||||
virtual const char* GetIDEVersion() { return "15.0"; }
|
||||
|
||||
// Used to verify that the Desktop toolset for the current generator is
|
||||
// installed on the machine.
|
||||
virtual bool IsWindowsDesktopToolsetInstalled() const;
|
||||
|
||||
// These aren't virtual because we need to check if the selected version
|
||||
// of the toolset is installed
|
||||
bool IsWindowsStoreToolsetInstalled() const;
|
||||
|
||||
private:
|
||||
class Factory;
|
||||
};
|
||||
#endif
|
|
@ -163,6 +163,18 @@ std::string cmGlobalVisualStudio7Generator::FindDevEnvCommand()
|
|||
}
|
||||
}
|
||||
|
||||
// Search where VS15Preview places it.
|
||||
vskey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7;";
|
||||
vskey += this->GetIDEVersion();
|
||||
if (cmSystemTools::ReadRegistryValue(vskey.c_str(), vscmd,
|
||||
cmSystemTools::KeyWOW64_32)) {
|
||||
cmSystemTools::ConvertToUnixSlashes(vscmd);
|
||||
vscmd += "/Common7/IDE/devenv.com";
|
||||
if (cmSystemTools::FileExists(vscmd, true)) {
|
||||
return vscmd;
|
||||
}
|
||||
}
|
||||
|
||||
vscmd = "devenv.com";
|
||||
return vscmd;
|
||||
}
|
||||
|
|
|
@ -34,7 +34,8 @@ public:
|
|||
VS11 = 110,
|
||||
VS12 = 120,
|
||||
/* VS13 = 130 was skipped */
|
||||
VS14 = 140
|
||||
VS14 = 140,
|
||||
VS15 = 150
|
||||
};
|
||||
|
||||
cmGlobalVisualStudioGenerator(cmake* cm);
|
||||
|
|
|
@ -96,6 +96,7 @@ void cmVisualStudioGeneratorOptions::FixExceptionHandlingDefault()
|
|||
case cmGlobalVisualStudioGenerator::VS11:
|
||||
case cmGlobalVisualStudioGenerator::VS12:
|
||||
case cmGlobalVisualStudioGenerator::VS14:
|
||||
case cmGlobalVisualStudioGenerator::VS15:
|
||||
// by default VS puts <ExceptionHandling></ExceptionHandling> empty
|
||||
// for a project, to make our projects look the same put a new line
|
||||
// and space over for the closing </ExceptionHandling> as the default
|
||||
|
|
|
@ -66,6 +66,7 @@
|
|||
#include "cmGlobalVisualStudio11Generator.h"
|
||||
#include "cmGlobalVisualStudio12Generator.h"
|
||||
#include "cmGlobalVisualStudio14Generator.h"
|
||||
#include "cmGlobalVisualStudio15Generator.h"
|
||||
#include "cmGlobalVisualStudio71Generator.h"
|
||||
#include "cmGlobalVisualStudio8Generator.h"
|
||||
#include "cmGlobalVisualStudio9Generator.h"
|
||||
|
@ -1317,6 +1318,7 @@ int cmake::ActualConfigure()
|
|||
{ "11.0", "Visual Studio 11 2012" },
|
||||
{ "12.0", "Visual Studio 12 2013" },
|
||||
{ "14.0", "Visual Studio 14 2015" },
|
||||
{ "15.0", "Visual Studio 15" },
|
||||
{ 0, 0 }
|
||||
};
|
||||
for (int i = 0; version[i].MSVersion != 0; i++) {
|
||||
|
@ -1634,6 +1636,7 @@ void cmake::AddDefaultGenerators()
|
|||
{
|
||||
#if defined(_WIN32) && !defined(__CYGWIN__)
|
||||
#if !defined(CMAKE_BOOT_MINGW)
|
||||
this->Generators.push_back(cmGlobalVisualStudio15Generator::NewFactory());
|
||||
this->Generators.push_back(cmGlobalVisualStudio14Generator::NewFactory());
|
||||
this->Generators.push_back(cmGlobalVisualStudio12Generator::NewFactory());
|
||||
this->Generators.push_back(cmGlobalVisualStudio11Generator::NewFactory());
|
||||
|
|
|
@ -3,7 +3,7 @@ include(RunCMake)
|
|||
set(RunCMake_GENERATOR_PLATFORM "")
|
||||
run_cmake(NoPlatform)
|
||||
|
||||
if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[0124])( 20[0-9][0-9])?$")
|
||||
if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[01245])( 20[0-9][0-9])?$")
|
||||
set(RunCMake_GENERATOR_PLATFORM "x64")
|
||||
run_cmake(x64Platform)
|
||||
else()
|
||||
|
@ -17,7 +17,7 @@ set(RunCMake_TEST_OPTIONS -A "Extra Platform")
|
|||
run_cmake(TwoPlatforms)
|
||||
unset(RunCMake_TEST_OPTIONS)
|
||||
|
||||
if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[0124])( 20[0-9][0-9])?$")
|
||||
if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[01245])( 20[0-9][0-9])?$")
|
||||
set(RunCMake_TEST_OPTIONS -DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/TestPlatform-toolchain.cmake)
|
||||
run_cmake(TestPlatformToolchain)
|
||||
unset(RunCMake_TEST_OPTIONS)
|
||||
|
|
|
@ -3,7 +3,7 @@ include(RunCMake)
|
|||
set(RunCMake_GENERATOR_TOOLSET "")
|
||||
run_cmake(NoToolset)
|
||||
|
||||
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[0124]|Xcode" AND NOT XCODE_BELOW_3)
|
||||
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[01245]|Xcode" AND NOT XCODE_BELOW_3)
|
||||
set(RunCMake_GENERATOR_TOOLSET "Test Toolset")
|
||||
run_cmake(TestToolset)
|
||||
else()
|
||||
|
@ -17,7 +17,7 @@ set(RunCMake_TEST_OPTIONS -T "Extra Toolset")
|
|||
run_cmake(TwoToolsets)
|
||||
unset(RunCMake_TEST_OPTIONS)
|
||||
|
||||
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[0124]|Xcode" AND NOT XCODE_BELOW_3)
|
||||
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[01245]|Xcode" AND NOT XCODE_BELOW_3)
|
||||
set(RunCMake_TEST_OPTIONS -DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/TestToolset-toolchain.cmake)
|
||||
run_cmake(TestToolsetToolchain)
|
||||
unset(RunCMake_TEST_OPTIONS)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
cmake_minimum_required (VERSION 2.6)
|
||||
project(VSExternalInclude)
|
||||
|
||||
if(${CMAKE_GENERATOR} MATCHES "Visual Studio 1[0124]")
|
||||
if(${CMAKE_GENERATOR} MATCHES "Visual Studio 1[01245]")
|
||||
set(PROJECT_EXT vcxproj)
|
||||
else()
|
||||
set(PROJECT_EXT vcproj)
|
||||
|
@ -55,7 +55,7 @@ add_dependencies(VSExternalInclude lib2)
|
|||
# and the sln file can no longer be the only source
|
||||
# of that depend. So, for VS 10 make the executable
|
||||
# depend on lib1 and lib2
|
||||
if(${CMAKE_GENERATOR} MATCHES "Visual Studio 1[0124]")
|
||||
if(${CMAKE_GENERATOR} MATCHES "Visual Studio 1[01245]")
|
||||
add_dependencies(VSExternalInclude lib1)
|
||||
endif()
|
||||
|
||||
|
|
Loading…
Reference in New Issue