Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'backport-vs2026' into vs2026

Browse Source
This commit is contained in:
Brad King
2025-09-15 11:33:57 -04:00
parent 29633b2f81 3392b371e2
commit cd46d8ec84
25 changed files with 3816 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Help/generator/Visual Studio 18 2026.rst Normal file
View File

@@ -0,0 +1,47 @@
Visual Studio 18 2026
---------------------
.. versionadded:: 4.2
Generates Visual Studio 18 (VS 2026) project files.
Project Types
^^^^^^^^^^^^^
Only Visual C++ and C# projects may be generated (and Fortran with
Intel compiler integration). Other types of projects (JavaScript,
Powershell, Python, etc.) are not supported.
Instance Selection
^^^^^^^^^^^^^^^^^^
VS 2026 supports multiple installations on the same machine. The
:variable:`CMAKE_GENERATOR_INSTANCE` variable may be used to select one.
Platform Selection
^^^^^^^^^^^^^^^^^^
The default target platform name (architecture) is that of the host
and is provided in the :variable:`CMAKE_VS_PLATFORM_NAME_DEFAULT` variable.
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 18 2026" -A Win32``
* ``cmake -G "Visual Studio 18 2026" -A x64``
* ``cmake -G "Visual Studio 18 2026" -A ARM``
* ``cmake -G "Visual Studio 18 2026" -A ARM64``
Toolset Selection
^^^^^^^^^^^^^^^^^
The ``v145`` toolset that comes with VS 18 2026 is selected by default.
The :variable:`CMAKE_GENERATOR_TOOLSET` option may be set, perhaps
via the :option:`cmake -T` option, to specify another toolset.
.. |VS_TOOLSET_HOST_ARCH_DEFAULT| replace::
By default this generator uses the 64-bit variant on x64 hosts and
the 32-bit variant otherwise.
.. include:: include/VS_TOOLSET_HOST_ARCH.rst

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

@@ -100,6 +100,7 @@ Visual Studio Generators
/generator/Visual Studio 15 2017
/generator/Visual Studio 16 2019
/generator/Visual Studio 17 2022
/generator/Visual Studio 18 2026
Other Generators
^^^^^^^^^^^^^^^^

1
Help/variable/MSVC_TOOLSET_VERSION.rst
View File

@@ -24,6 +24,7 @@ Known toolset version numbers are:
141 VS 2017 (15.0)
142 VS 2019 (16.0)
143 VS 2022 (17.0)
145 VS 2026 (18.0)
===== ==============
Compiler versions newer than those known to CMake will be reported

1
Help/variable/MSVC_VERSION.rst
View File

@@ -26,6 +26,7 @@ Known version numbers are:
1910-1919 VS 15.0 (v141 toolset)
1920-1929 VS 16.0 (v142 toolset)
1930-1949 VS 17.0 (v143 toolset)
1950-1959 VS 18.0 (v145 toolset)
========= ==============
See also the :variable:`CMAKE_<LANG>_COMPILER_VERSION` and

4
Modules/CMakeCSharpCompilerId.cs.in
View File

@@ -19,6 +19,8 @@ namespace CSharp
+ "Visual Studio"
#elif PlatformToolsetv143
+ "Visual Studio"
#elif PlatformToolsetv145
+ "Visual Studio"
#else
+ "unknown"
#endif
@@ -53,6 +55,8 @@ namespace CSharp
+ "2019"
#elif PlatformToolsetv143
+ "2022"
#elif PlatformToolsetv145
+ "2026"
#else
+ "9999"
#endif

8
Modules/InstallRequiredSystemLibraries.cmake
View File

@@ -247,8 +247,12 @@ if(MSVC)
set(_MSVC_IDE_VERSION "")
if(MSVC_VERSION GREATER_EQUAL 2000)
message(WARNING "MSVC ${MSVC_VERSION} not yet supported.")
elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 144)
elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 146)
message(WARNING "MSVC toolset v${MSVC_TOOLSET_VERSION} not yet supported.")
elseif(MSVC_TOOLSET_VERSION EQUAL 145)
set(MSVC_REDIST_NAME VC145)
set(_MSVC_DLL_VERSION 140)
set(_MSVC_IDE_VERSION 18)
elseif(MSVC_TOOLSET_VERSION EQUAL 143)
set(MSVC_REDIST_NAME VC143)
set(_MSVC_DLL_VERSION 140)
@@ -293,7 +297,7 @@ if(MSVC)
if(NOT vs VERSION_LESS 15)
set(_vs_redist_paths "")
# The toolset and its redistributables may come with any VS version 15 or newer.
set(_MSVC_IDE_VERSIONS 17 16 15)
set(_MSVC_IDE_VERSIONS 18 17 16 15)
foreach(_vs_ver ${_MSVC_IDE_VERSIONS})
set(_vs_glob_redist_paths "")
cmake_host_system_information(RESULT _vs_dir QUERY VS_${_vs_ver}_DIR) # undocumented query

2
Modules/Platform/Windows-GNU.cmake
View File

@@ -181,7 +181,7 @@ macro(__windows_compiler_gnu_abi lang)
# Query the VS Installer tool for locations of VS 2017 and above.
set(_vs_installer_paths "")
foreach(vs RANGE 17 15 -1) # change the first number to the largest supported version
foreach(vs RANGE 18 15 -1) # change the first number to the largest supported version
cmake_host_system_information(RESULT _vs_dir QUERY VS_${vs}_DIR)
if(_vs_dir)
list(APPEND _vs_installer_paths "${_vs_dir}/VC/Auxiliary/Build")

5
Modules/Platform/Windows-MSVC.cmake
View File

@@ -61,7 +61,10 @@ if(NOT MSVC_VERSION)
message(FATAL_ERROR "MSVC compiler version not detected properly: ${_compiler_version}")
endif()
if(MSVC_VERSION GREATER_EQUAL 1930)
if(MSVC_VERSION GREATER_EQUAL 1950)
# VS 2026 or greater
set(MSVC_TOOLSET_VERSION 145)
elseif(MSVC_VERSION GREATER_EQUAL 1930)
# VS 2022 or greater
set(MSVC_TOOLSET_VERSION 143)
elseif(MSVC_VERSION GREATER_EQUAL 1920)

2
Source/cmCMakeHostSystemInformationCommand.cxx
View File

@@ -498,7 +498,7 @@ cm::optional<std::string> GetWindowsValue(cmExecutionStatus& status,
std::string const& key)
{
auto* const gg = status.GetMakefile().GetGlobalGenerator();
for (auto vs : { 15, 16, 17 }) {
for (auto vs : { 15, 16, 17, 18 }) {
if (key == cmStrCat("VS_"_s, vs, "_DIR"_s)) {
std::string value;
// If generating for the VS nn IDE, use the same instance.

2
Source/cmGlobalVisualStudio10Generator.cxx
View File

@@ -1275,6 +1275,8 @@ char const* cmGlobalVisualStudio10Generator::GetToolsVersion() const
return "16.0";
case cmGlobalVisualStudioGenerator::VSVersion::VS17:
return "17.0";
case cmGlobalVisualStudioGenerator::VSVersion::VS18:
return "18.0";
}
return "";
}

10
Source/cmGlobalVisualStudio71Generator.cxx
View File

@@ -66,16 +66,6 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(
this->WriteSLNFooter(fout);
}
void cmGlobalVisualStudio71Generator::WriteSolutionConfigurations(
std::ostream& fout, std::vector<std::string> const& configs) const
{
fout << "\tGlobalSection(SolutionConfiguration) = preSolution\n";
for (std::string const& i : configs) {
fout << "\t\t" << i << " = " << i << '\n';
}
fout << "\tEndGlobalSection\n";
}
// Write a dsp file into the SLN file,
// Note, that dependencies from executables to
// the libraries it uses are also done here

2
Source/cmGlobalVisualStudio71Generator.h
View File

@@ -32,7 +32,7 @@ protected:
OrderedTargetDependSet const& orderedProjectTargets,
VSFolders const& vsFolders) const override;
virtual void WriteSolutionConfigurations(
std::ostream& fout, std::vector<std::string> const& configs) const;
std::ostream& fout, std::vector<std::string> const& configs) const = 0;
void WriteProject(std::ostream& fout, std::string const& name,
std::string const& path,
cmGeneratorTarget const* t) const override;

25
Source/cmGlobalVisualStudioGenerator.cxx
View File

@@ -115,6 +115,8 @@ char const* cmGlobalVisualStudioGenerator::GetIDEVersion() const
return "16.0";
case cmGlobalVisualStudioGenerator::VSVersion::VS17:
return "17.0";
case cmGlobalVisualStudioGenerator::VSVersion::VS18:
return "18.0";
}
return "";
}
@@ -138,29 +140,22 @@ void cmGlobalVisualStudioGenerator::WriteSLNHeader(std::ostream& fout) const
case cmGlobalVisualStudioGenerator::VSVersion::VS15:
// 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";
}
fout << "# Visual Studio 15\n";
break;
case cmGlobalVisualStudioGenerator::VSVersion::VS16:
// Visual Studio 16 writes .sln format 12.00
fout << "Microsoft Visual Studio Solution File, Format Version 12.00\n";
if (this->ExpressEdition) {
fout << "# Visual Studio Express 16 for Windows Desktop\n";
} else {
fout << "# Visual Studio Version 16\n";
}
fout << "# Visual Studio Version 16\n";
break;
case cmGlobalVisualStudioGenerator::VSVersion::VS17:
// Visual Studio 17 writes .sln format 12.00
fout << "Microsoft Visual Studio Solution File, Format Version 12.00\n";
if (this->ExpressEdition) {
fout << "# Visual Studio Express 17 for Windows Desktop\n";
} else {
fout << "# Visual Studio Version 17\n";
}
fout << "# Visual Studio Version 17\n";
break;
case cmGlobalVisualStudioGenerator::VSVersion::VS18:
// Visual Studio 18 writes .sln format 12.00
fout << "Microsoft Visual Studio Solution File, Format Version 12.00\n";
fout << "# Visual Studio Version 18\n";
break;
}
}

3
Source/cmGlobalVisualStudioGenerator.h
View File

@@ -37,7 +37,8 @@ public:
VS14 = 140,
VS15 = 150,
VS16 = 160,
VS17 = 170
VS17 = 170,
VS18 = 180,
};
~cmGlobalVisualStudioGenerator() override;

88
Source/cmGlobalVisualStudioVersionedGenerator.cxx
View File

@@ -133,6 +133,8 @@ static unsigned int VSVersionToMajor(
return 16;
case cmGlobalVisualStudioGenerator::VSVersion::VS17:
return 17;
case cmGlobalVisualStudioGenerator::VSVersion::VS18:
return 18;
}
return 0;
}
@@ -149,6 +151,8 @@ static char const* VSVersionToToolset(
return "v142";
case cmGlobalVisualStudioGenerator::VSVersion::VS17:
return "v143";
case cmGlobalVisualStudioGenerator::VSVersion::VS18:
return "v145";
}
return "";
}
@@ -165,6 +169,8 @@ static std::string VSVersionToMajorString(
return "16";
case cmGlobalVisualStudioGenerator::VSVersion::VS17:
return "17";
case cmGlobalVisualStudioGenerator::VSVersion::VS18:
return "18";
}
return "";
}
@@ -178,6 +184,7 @@ static char const* VSVersionToAndroidToolset(
case cmGlobalVisualStudioGenerator::VSVersion::VS15:
case cmGlobalVisualStudioGenerator::VSVersion::VS16:
case cmGlobalVisualStudioGenerator::VSVersion::VS17:
case cmGlobalVisualStudioGenerator::VSVersion::VS18:
return "Clang_5_0";
}
return "";
@@ -258,6 +265,7 @@ cmGlobalVisualStudioVersionedGenerator::NewFactory15()
static char const vs16generatorName[] = "Visual Studio 16 2019";
static char const vs17generatorName[] = "Visual Studio 17 2022";
static char const vs18generatorName[] = "Visual Studio 18 2026";
// Map generator name without year to name with year.
static char const* cmVS16GenName(std::string const& name, std::string& genName)
@@ -288,6 +296,20 @@ static char const* cmVS17GenName(std::string const& name, std::string& genName)
return p;
}
static char const* cmVS18GenName(std::string const& name, std::string& genName)
{
if (strncmp(name.c_str(), vs18generatorName,
sizeof(vs18generatorName) - 6) != 0) {
return nullptr;
}
char const* p = name.c_str() + sizeof(vs18generatorName) - 6;
if (cmHasLiteralPrefix(p, " 2026")) {
p += 5;
}
genName = cmStrCat(vs18generatorName, p);
return p;
}
class cmGlobalVisualStudioVersionedGenerator::Factory16
: public cmGlobalGeneratorFactory
{
@@ -408,6 +430,66 @@ cmGlobalVisualStudioVersionedGenerator::NewFactory17()
return std::unique_ptr<cmGlobalGeneratorFactory>(new Factory17);
}
class cmGlobalVisualStudioVersionedGenerator::Factory18
: public cmGlobalGeneratorFactory
{
public:
std::unique_ptr<cmGlobalGenerator> CreateGlobalGenerator(
std::string const& name, cmake* cm) const override
{
std::string genName;
char const* p = cmVS18GenName(name, genName);
if (!p) {
return std::unique_ptr<cmGlobalGenerator>();
}
if (!*p) {
return std::unique_ptr<cmGlobalGenerator>(
new cmGlobalVisualStudioVersionedGenerator(
cmGlobalVisualStudioGenerator::VSVersion::VS18, cm, genName));
}
return std::unique_ptr<cmGlobalGenerator>();
}
cmDocumentationEntry GetDocumentation() const override
{
return { std::string(vs18generatorName),
"Generates Visual Studio 2026 project files. "
"Use -A option to specify architecture." };
}
std::vector<std::string> GetGeneratorNames() const override
{
std::vector<std::string> names;
names.push_back(vs18generatorName);
return names;
}
bool SupportsToolset() const override { return true; }
bool SupportsPlatform() const override { return true; }
std::vector<std::string> GetKnownPlatforms() const override
{
std::vector<std::string> platforms;
platforms.emplace_back("x64");
platforms.emplace_back("Win32");
platforms.emplace_back("ARM");
platforms.emplace_back("ARM64");
platforms.emplace_back("ARM64EC");
return platforms;
}
std::string GetDefaultPlatformName() const override
{
return VSHostPlatformName();
}
};
std::unique_ptr<cmGlobalGeneratorFactory>
cmGlobalVisualStudioVersionedGenerator::NewFactory18()
{
return std::unique_ptr<cmGlobalGeneratorFactory>(new Factory18);
}
cmGlobalVisualStudioVersionedGenerator::cmGlobalVisualStudioVersionedGenerator(
VSVersion version, cmake* cm, std::string const& name)
: cmGlobalVisualStudio14Generator(cm, name)
@@ -455,6 +537,11 @@ bool cmGlobalVisualStudioVersionedGenerator::MatchesGeneratorName(
return genName == this->GetName();
}
break;
case cmGlobalVisualStudioGenerator::VSVersion::VS18:
if (cmVS18GenName(name, genName)) {
return genName == this->GetName();
}
break;
}
return false;
}
@@ -709,6 +796,7 @@ cmGlobalVisualStudioVersionedGenerator::GetAndroidApplicationTypeRevision()
case cmGlobalVisualStudioGenerator::VSVersion::VS15:
case cmGlobalVisualStudioGenerator::VSVersion::VS16:
case cmGlobalVisualStudioGenerator::VSVersion::VS17:
case cmGlobalVisualStudioGenerator::VSVersion::VS18:
return "3.0";
}
return "";

3
Source/cmGlobalVisualStudioVersionedGenerator.h
View File

@@ -26,6 +26,7 @@ public:
static std::unique_ptr<cmGlobalGeneratorFactory> NewFactory15();
static std::unique_ptr<cmGlobalGeneratorFactory> NewFactory16();
static std::unique_ptr<cmGlobalGeneratorFactory> NewFactory17();
static std::unique_ptr<cmGlobalGeneratorFactory> NewFactory18();
bool MatchesGeneratorName(std::string const& name) const override;
@@ -89,6 +90,8 @@ private:
friend class Factory16;
class Factory17;
friend class Factory17;
class Factory18;
friend class Factory18;
mutable cmVSSetupAPIHelper vsSetupAPIHelper;
bool ParseGeneratorInstance(std::string const& is, cmMakefile* mf);

6
Source/cmake.cxx
View File

@@ -2805,7 +2805,9 @@ std::unique_ptr<cmGlobalGenerator> cmake::EvaluateDefaultGlobalGenerator()
"\\Setup\\VC;ProductDir", //
";InstallDir" //
};
if (cmVSSetupAPIHelper(17).IsVSInstalled()) {
if (cmVSSetupAPIHelper(18).IsVSInstalled()) {
found = "Visual Studio 18 2026";
} else if (cmVSSetupAPIHelper(17).IsVSInstalled()) {
found = "Visual Studio 17 2022";
} else if (cmVSSetupAPIHelper(16).IsVSInstalled()) {
found = "Visual Studio 16 2019";
@@ -3252,6 +3254,8 @@ void cmake::AddDefaultGenerators()
{
#if defined(_WIN32) && !defined(__CYGWIN__)
# if !defined(CMAKE_BOOT_MINGW)
this->Generators.push_back(
cmGlobalVisualStudioVersionedGenerator::NewFactory18());
this->Generators.push_back(
cmGlobalVisualStudioVersionedGenerator::NewFactory17());
this->Generators.push_back(

1701
Templates/MSBuild/FlagTables/v145_CL.json Normal file
View File

File diff suppressed because it is too large Load Diff

560
Templates/MSBuild/FlagTables/v145_CSharp.json Normal file
View File

@@ -0,0 +1,560 @@
[
{
"name": "ProjectName",
"switch": "out:",
"comment": "",
"value": "",
"flags": [
"UserValue",
"UserRequired"
]
},
{
"name": "OutputType",
"switch": "target:exe",
"comment": "",
"value": "Exe",
"flags": []
},
{
"name": "OutputType",
"switch": "target:winexe",
"comment": "",
"value": "Winexe",
"flags": []
},
{
"name": "OutputType",
"switch": "target:library",
"comment": "",
"value": "Library",
"flags": []
},
{
"name": "OutputType",
"switch": "target:module",
"comment": "",
"value": "Module",
"flags": []
},
{
"name": "DocumentationFile",
"switch": "doc",
"comment": "",
"value": "",
"flags": [
"UserValue",
"UserRequired"
]
},
{
"name": "Platform",
"switch": "platform:x86",
"comment": "",
"value": "x86",
"flags": []
},
{
"name": "Platform",
"switch": "platform:Itanium",
"comment": "",
"value": "Itanium",
"flags": []
},
{
"name": "Platform",
"switch": "platform:x64",
"comment": "",
"value": "x64",
"flags": []
},
{
"name": "Platform",
"switch": "platform:arm",
"comment": "",
"value": "arm",
"flags": []
},
{
"name": "Platform",
"switch": "platform:anycpu32bitpreferred",
"comment": "",
"value": "anycpu32bitpreferred",
"flags": []
},
{
"name": "Platform",
"switch": "platform:anycpu",
"comment": "",
"value": "anycpu",
"flags": []
},
{
"name": "References",
"switch": "reference:",
"comment": "mit alias",
"value": "",
"flags": []
},
{
"name": "References",
"switch": "reference:",
"comment": "dateiliste",
"value": "",
"flags": []
},
{
"name": "AddModules",
"switch": "addmodule:",
"comment": "",
"value": "",
"flags": [
"SemicolonAppendable"
]
},
{
"name": "Win32Resource",
"switch": "win32res:",
"comment": "",
"value": "",
"flags": [
"UserValue",
"UserRequired"
]
},
{
"name": "ApplicationIcon",
"switch": "win32icon:",
"comment": "",
"value": "",
"flags": [
"UserValue",
"UserRequired"
]
},
{
"name": "ApplicationManifest",
"switch": "win32manifest:",
"comment": "",
"value": "",
"flags": [
"UserValue",
"UserRequired"
]
},
{
"name": "NoWin32Manifest",
"switch": "nowin32manifest",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "DefineDebug",
"switch": "debug",
"comment": "",
"value": "true",
"flags": [
"Continue"
]
},
{
"name": "DebugSymbols",
"switch": "debug",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "DebugSymbols",
"switch": "debug-",
"comment": "",
"value": "false",
"flags": []
},
{
"name": "DebugSymbols",
"switch": "debug+",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "DebugType",
"switch": "debug:none",
"comment": "",
"value": "none",
"flags": []
},
{
"name": "DebugType",
"switch": "debug:full",
"comment": "",
"value": "full",
"flags": []
},
{
"name": "DebugType",
"switch": "debug:pdbonly",
"comment": "",
"value": "pdbonly",
"flags": []
},
{
"name": "DebugType",
"switch": "debug:portable",
"comment": "",
"value": "portable",
"flags": []
},
{
"name": "DebugType",
"switch": "debug:embedded",
"comment": "",
"value": "embedded",
"flags": []
},
{
"name": "Optimize",
"switch": "optimize",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "Optimize",
"switch": "optimize-",
"comment": "",
"value": "false",
"flags": []
},
{
"name": "Optimize",
"switch": "optimize+",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "TreatWarningsAsErrors",
"switch": "warnaserror",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "TreatWarningsAsErrors",
"switch": "warnaserror-",
"comment": "",
"value": "false",
"flags": []
},
{
"name": "TreatWarningsAsErrors",
"switch": "warnaserror+",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "WarningsAsErrors",
"switch": "warnaserror",
"comment": "",
"value": "",
"flags": []
},
{
"name": "WarningsAsErrors",
"switch": "warnaserror-",
"comment": "",
"value": "",
"flags": []
},
{
"name": "WarningsAsErrors",
"switch": "warnaserror+",
"comment": "",
"value": "",
"flags": []
},
{
"name": "WarningsAsErrors",
"switch": "warnaserror:",
"comment": "",
"value": "",
"flags": [
"UserValue",
"UserRequired",
"CommaAppendable"
]
},
{
"name": "WarningLevel",
"switch": "warn:0",
"comment": "",
"value": "0",
"flags": []
},
{
"name": "WarningLevel",
"switch": "warn:1",
"comment": "",
"value": "1",
"flags": []
},
{
"name": "WarningLevel",
"switch": "warn:2",
"comment": "",
"value": "2",
"flags": []
},
{
"name": "WarningLevel",
"switch": "warn:3",
"comment": "",
"value": "3",
"flags": []
},
{
"name": "WarningLevel",
"switch": "warn:4",
"comment": "",
"value": "4",
"flags": []
},
{
"name": "NoWarn",
"switch": "nowarn:",
"comment": "",
"value": "",
"flags": [
"UserValue",
"UserRequired",
"CommaAppendable"
]
},
{
"name": "CheckForOverflowUnderflow",
"switch": "checked",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "CheckForOverflowUnderflow",
"switch": "checked-",
"comment": "",
"value": "false",
"flags": []
},
{
"name": "CheckForOverflowUnderflow",
"switch": "checked+",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "AllowUnsafeBlocks",
"switch": "unsafe",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "AllowUnsafeBlocks",
"switch": "unsafe-",
"comment": "",
"value": "false",
"flags": []
},
{
"name": "AllowUnsafeBlocks",
"switch": "unsafe+",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "DefineConstants",
"switch": "define:",
"comment": "",
"value": "",
"flags": [
"SemicolonAppendable",
"UserValue"
]
},
{
"name": "LangVersion",
"switch": "langversion:",
"comment": "",
"value": "",
"flags": [
"UserValue",
"UserRequired"
]
},
{
"name": "DelaySign",
"switch": "delaysign",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "DelaySign",
"switch": "delaysign-",
"comment": "",
"value": "false",
"flags": []
},
{
"name": "DelaySign",
"switch": "delaysign+",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "AssemblyOriginatorKeyFile",
"switch": "keyfile",
"comment": "",
"value": "",
"flags": []
},
{
"name": "KeyContainerName",
"switch": "keycontainer",
"comment": "",
"value": "",
"flags": []
},
{
"name": "NoLogo",
"switch": "nologo",
"comment": "",
"value": "",
"flags": []
},
{
"name": "NoConfig",
"switch": "noconfig",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "BaseAddress",
"switch": "baseaddress:",
"comment": "",
"value": "",
"flags": []
},
{
"name": "CodePage",
"switch": "codepage",
"comment": "",
"value": "",
"flags": []
},
{
"name": "Utf8Output",
"switch": "utf8output",
"comment": "",
"value": "",
"flags": []
},
{
"name": "MainEntryPoint",
"switch": "main:",
"comment": "",
"value": "",
"flags": []
},
{
"name": "GenerateFullPaths",
"switch": "fullpaths",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "FileAlignment",
"switch": "filealign",
"comment": "",
"value": "",
"flags": []
},
{
"name": "PdbFile",
"switch": "pdb:",
"comment": "",
"value": "",
"flags": []
},
{
"name": "NoStdLib",
"switch": "nostdlib",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "NoStdLib",
"switch": "nostdlib-",
"comment": "",
"value": "false",
"flags": []
},
{
"name": "NoStdLib",
"switch": "nostdlib+",
"comment": "",
"value": "true",
"flags": []
},
{
"name": "SubsystemVersion",
"switch": "subsystemversion",
"comment": "",
"value": "",
"flags": []
},
{
"name": "AdditionalLibPaths",
"switch": "lib:",
"comment": "",
"value": "",
"flags": []
},
{
"name": "ErrorReport",
"switch": "errorreport:none",
"comment": "Do Not Send Report",
"value": "none",
"flags": []
},
{
"name": "ErrorReport",
"switch": "errorreport:prompt",
"comment": "Prompt Immediately",
"value": "prompt",
"flags": []
},
{
"name": "ErrorReport",
"switch": "errorreport:queue",
"comment": "Queue For Next Login",
"value": "queue",
"flags": []
},
{
"name": "ErrorReport",
"switch": "errorreport:send",
"comment": "Send Automatically",
"value": "send",
"flags": []
}
]

1367
Templates/MSBuild/FlagTables/v145_Link.json Normal file
View File

File diff suppressed because it is too large Load Diff

8
Tests/CMakeLists.txt
View File

@@ -203,9 +203,12 @@ if(BUILD_TESTING)
set(info_vs15 "VS_15_DIR")
set(info_vs16 "VS_16_DIR")
set(info_vs17 "VS_17_DIR")
set(info_vs18 "VS_18_DIR")
set(vs_versions)
if(WIN32)
if(NOT CMAKE_VERSION VERSION_LESS 3.21.20210624)
if(NOT CMAKE_VERSION VERSION_LESS 4.2)
set(vs_versions vs15 vs16 vs17 vs18)
elseif(NOT CMAKE_VERSION VERSION_LESS 3.21)
set(vs_versions vs15 vs16 vs17)
elseif(NOT CMAKE_VERSION VERSION_LESS 3.14)
set(vs_versions vs15 vs16)
@@ -2410,6 +2413,9 @@ if(BUILD_TESTING)
if(vs17 AND CMake_TEST_ANDROID_VS17)
add_test_VSAndroid(vs17 "Visual Studio 17 2022" "ARM")
endif()
if(vs18 AND CMake_TEST_ANDROID_VS18)
add_test_VSAndroid(vs18 "Visual Studio 18 2026" "ARM")
endif()
if(APPLE)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")

2
Tests/RunCMake/CommandLine/RunCMakeTest.cmake
View File

@@ -413,7 +413,7 @@ function(run_EnvironmentGenerator)
unset(ENV{CMAKE_GENERATOR_PLATFORM})
endif()
# Instance is available since VS 2017.
if(RunCMake_GENERATOR MATCHES "Visual Studio 1[567].*")
if(RunCMake_GENERATOR MATCHES "Visual Studio 1[5678].*")
set(ENV{CMAKE_GENERATOR_INSTANCE} "invalid")
# Envvar shouldn't affect existing build tree
run_cmake_command(Envgen-instance-existing ${CMAKE_COMMAND} -E chdir ..

2
Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake
View File

@@ -27,7 +27,7 @@ else()
unset(RunCMake_TEST_OPTIONS)
endif()
if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio (1[4567])( 20[0-9][0-9])?$")
if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio (1[45678])( 20[0-9][0-9])?$")
unset(ENV{WindowsSDKVersion})
set(RunCMake_GENERATOR_PLATFORM "Test Platform,nocomma")

2
Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
View File

@@ -64,7 +64,7 @@ if("${RunCMake_GENERATOR}" MATCHES "Visual Studio")
run_cmake(BadToolsetHostArch)
set(RunCMake_GENERATOR_TOOLSET "Test Toolset,host=x64,host=x86")
run_cmake(BadToolsetHostArchTwice)
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[567]")
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[5678]")
set(RunCMake_GENERATOR_TOOLSET "VCTargetsPath=Test Path")
run_cmake(TestToolsetVCTargetsPathOnly)
set(RunCMake_GENERATOR_TOOLSET "Test Toolset,version=Test Toolset Version")

2
Tests/RunCMake/GeneratorToolset/TestToolsetHostArchNone.cmake
View File

@@ -2,7 +2,7 @@ message(STATUS "CMAKE_VS_PLATFORM_TOOLSET='${CMAKE_VS_PLATFORM_TOOLSET}'")
message(STATUS "CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE='${CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE}'")
message(STATUS "CMAKE_HOST_SYSTEM_PROCESSOR='${CMAKE_HOST_SYSTEM_PROCESSOR}'")
if(CMAKE_GENERATOR MATCHES "Visual Studio 1[67]")
if(CMAKE_GENERATOR MATCHES "Visual Studio 1[678]")
cmake_host_system_information(RESULT is_64_bit QUERY IS_64BIT)
if(is_64_bit)
if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "ARM64")