[Cmake-commits] CMake branch, master, updated. v3.11.2-851-g42752d0
Kitware Robot
kwrobot at kitware.com
Tue May 29 10:05:05 EDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 42752d0c11df67a9ca4f5e71efa58965c58552f8 (commit)
via a543a233a280f23e72ce5ff7d7a00239bd8634fb (commit)
via 70b930db38cba1b601bcb821b8b10e92e8c8b5ed (commit)
via e7e25c6cb6a4ce211976f0020a12a8a39e9131b6 (commit)
via edf0ea9bb2a0ecd411e14d0c7e27089cc258048b (commit)
via 1f994d9fdcf70ea16a5a3812d2151d9b7f27f784 (commit)
via 726c09029729673cf66386bafb7152b2d3b55466 (commit)
from 4e890800eb79cfa758c27ae55eb5ffe10b19fcb3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42752d0c11df67a9ca4f5e71efa58965c58552f8
commit 42752d0c11df67a9ca4f5e71efa58965c58552f8
Merge: a543a23 edf0ea9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 29 14:00:05 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 29 10:02:18 2018 -0400
Merge topic 'cuda-unused-placeholder'
edf0ea9bb2 CUDA: Drop unused/broken platform link flags placeholder
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2108
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a543a233a280f23e72ce5ff7d7a00239bd8634fb
commit a543a233a280f23e72ce5ff7d7a00239bd8634fb
Merge: 70b930d e7e25c6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 29 13:59:16 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 29 09:59:58 2018 -0400
Merge topic 'vs-raii-implement'
e7e25c6cb6 cmVisualStudio10TargetGenerator: Remove empty Elem::EndElement()
726c090297 cmVisualStudio10TargetGenerator: close XML tag in Elem destructor
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2109
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70b930db38cba1b601bcb821b8b10e92e8c8b5ed
commit 70b930db38cba1b601bcb821b8b10e92e8c8b5ed
Merge: 4e89080 1f994d9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 29 13:58:15 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 29 09:58:50 2018 -0400
Merge topic 'bootstrap_ccache_tweak'
1f994d9fdc bootstrap: Use ccache in script-generated makefile
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2107
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7e25c6cb6a4ce211976f0020a12a8a39e9131b6
commit e7e25c6cb6a4ce211976f0020a12a8a39e9131b6
Author: Vitaly Stakhovsky <vvs31415 at gitlab.org>
AuthorDate: Fri May 25 10:18:34 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 25 13:04:56 2018 -0400
cmVisualStudio10TargetGenerator: Remove empty Elem::EndElement()
The method no longer does anything. Remove it and remove calls to it.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index b373dce..f3b9c84 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -97,7 +97,6 @@ struct cmVisualStudio10TargetGenerator::Elem
}
this->S << cmVS10EscapeXML(val);
}
- void EndElement() {}
~Elem()
{
// Do not emit element which has not been started
@@ -408,14 +407,12 @@ void cmVisualStudio10TargetGenerator::Generate()
// Require Nsight Tegra 1.6 for JCompile support.
e1.Element("NsightTegraProjectRevisionNumber", "7");
}
- e1.EndElement();
}
if (const char* hostArch =
this->GlobalGenerator->GetPlatformToolsetHostArchitecture()) {
Elem e1(e0, "PropertyGroup");
e1.Element("PreferredToolArchitecture", hostArch);
- e1.EndElement();
}
if (this->ProjectType != csproj) {
@@ -556,28 +553,23 @@ void cmVisualStudio10TargetGenerator::Generate()
e1.Element("OutputType", outputType);
e1.Element("AppDesignerFolder", "Properties");
}
-
- e1.EndElement();
}
switch (this->ProjectType) {
case vcxproj:
- Elem(e0, "Import")
- .Attribute("Project", VS10_CXX_DEFAULT_PROPS)
- .EndElement();
+ Elem(e0, "Import").Attribute("Project", VS10_CXX_DEFAULT_PROPS);
break;
case csproj:
Elem(e0, "Import")
.Attribute("Project", VS10_CSharp_DEFAULT_PROPS)
- .Attribute("Condition", "Exists('" VS10_CSharp_DEFAULT_PROPS "')")
- .EndElement();
+ .Attribute("Condition", "Exists('" VS10_CSharp_DEFAULT_PROPS "')");
break;
}
this->WriteProjectConfigurationValues(e0);
if (this->ProjectType == vcxproj) {
- Elem(e0, "Import").Attribute("Project", VS10_CXX_PROPS).EndElement();
+ Elem(e0, "Import").Attribute("Project", VS10_CXX_PROPS);
}
{
Elem e1(e0, "ImportGroup");
@@ -586,16 +578,15 @@ void cmVisualStudio10TargetGenerator::Generate()
if (this->GlobalGenerator->IsCudaEnabled()) {
Elem(e1, "Import")
- .Attribute(
- "Project", "$(VCTargetsPath)\\BuildCustomizations\\CUDA " +
- this->GlobalGenerator->GetPlatformToolsetCudaString() + ".props")
- .EndElement();
+ .Attribute("Project",
+ "$(VCTargetsPath)\\BuildCustomizations\\CUDA " +
+ this->GlobalGenerator->GetPlatformToolsetCudaString() +
+ ".props");
}
if (this->GlobalGenerator->IsMasmEnabled()) {
Elem(e1, "Import")
.Attribute("Project",
- "$(VCTargetsPath)\\BuildCustomizations\\masm.props")
- .EndElement();
+ "$(VCTargetsPath)\\BuildCustomizations\\masm.props");
}
if (this->GlobalGenerator->IsNasmEnabled()) {
// Always search in the standard modules location.
@@ -608,9 +599,8 @@ void cmVisualStudio10TargetGenerator::Generate()
ConvertToWindowsSlash(propsLocal);
this->Makefile->ConfigureFile(propsTemplate.c_str(),
propsLocal.c_str(), false, true, true);
- Elem(e1, "Import").Attribute("Project", propsLocal).EndElement();
+ Elem(e1, "Import").Attribute("Project", propsLocal);
}
- e1.EndElement();
}
{
Elem e1(e0, "ImportGroup");
@@ -633,14 +623,12 @@ void cmVisualStudio10TargetGenerator::Generate()
Elem(e1, "Import")
.Attribute("Project", props)
.Attribute("Condition", "exists('" + props + "')")
- .Attribute("Label", "LocalAppDataPlatform")
- .EndElement();
+ .Attribute("Label", "LocalAppDataPlatform");
}
this->WritePlatformExtensions(e1);
- e1.EndElement();
}
- Elem(e0, "PropertyGroup").Attribute("Label", "UserMacros").EndElement();
+ Elem(e0, "PropertyGroup").Attribute("Label", "UserMacros");
this->WriteWinRTPackageCertificateKeyFile(e0);
this->WritePathAndIncrementalLinkOptions(e0);
this->WriteItemDefinitionGroups(e0);
@@ -654,12 +642,10 @@ void cmVisualStudio10TargetGenerator::Generate()
this->WriteSDKReferences(e0);
switch (this->ProjectType) {
case vcxproj:
- Elem(e0, "Import").Attribute("Project", VS10_CXX_TARGETS).EndElement();
+ Elem(e0, "Import").Attribute("Project", VS10_CXX_TARGETS);
break;
case csproj:
- Elem(e0, "Import")
- .Attribute("Project", VS10_CSharp_TARGETS)
- .EndElement();
+ Elem(e0, "Import").Attribute("Project", VS10_CSharp_TARGETS);
break;
}
@@ -674,21 +660,18 @@ void cmVisualStudio10TargetGenerator::Generate()
.Attribute("Project",
"$(VCTargetsPath)\\BuildCustomizations\\CUDA " +
this->GlobalGenerator->GetPlatformToolsetCudaString() +
- ".targets")
- .EndElement();
+ ".targets");
}
if (this->GlobalGenerator->IsMasmEnabled()) {
Elem(e1, "Import")
.Attribute("Project",
- "$(VCTargetsPath)\\BuildCustomizations\\masm.targets")
- .EndElement();
+ "$(VCTargetsPath)\\BuildCustomizations\\masm.targets");
}
if (this->GlobalGenerator->IsNasmEnabled()) {
std::string nasmTargets =
GetCMakeFilePath("Templates/MSBuild/nasm.targets");
- Elem(e1, "Import").Attribute("Project", nasmTargets).EndElement();
+ Elem(e1, "Import").Attribute("Project", nasmTargets);
}
- e1.EndElement();
}
if (this->ProjectType == csproj) {
for (std::string const& c : this->Configurations) {
@@ -696,7 +679,6 @@ void cmVisualStudio10TargetGenerator::Generate()
e1.Attribute("Condition", "'$(Configuration)' == '" + c + "'");
e1.SetHasElements();
this->WriteEvents(e1, c);
- e1.EndElement();
}
// make sure custom commands are executed before build (if necessary)
{
@@ -709,10 +691,8 @@ void cmVisualStudio10TargetGenerator::Generate()
oss << " "
<< "$(BuildDependsOn)\n";
e1.Element("BuildDependsOn", oss.str());
- e1.EndElement();
}
}
- e0.EndElement();
}
if (BuildFileStream.Close()) {
@@ -768,7 +748,6 @@ void cmVisualStudio10TargetGenerator::WriteDotNetReferences(Elem& e0)
this->WriteDotNetReference(e1, i.first, i.second, h.first);
}
}
- e1.EndElement();
}
}
@@ -798,7 +777,6 @@ void cmVisualStudio10TargetGenerator::WriteDotNetReference(
e2.Element("HintPath", hint);
}
this->WriteDotNetReferenceCustomTags(e2, ref);
- e2.EndElement();
}
void cmVisualStudio10TargetGenerator::WriteDotNetReferenceCustomTags(
@@ -921,10 +899,7 @@ void cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup(Elem& e0)
}
}
}
-
- e2.EndElement();
}
- e1.EndElement();
}
}
@@ -965,9 +940,7 @@ void cmVisualStudio10TargetGenerator::WriteXamlFilesGroup(Elem& e0)
}
}
e2.Element("SubType", "Designer");
- e2.EndElement();
}
- e1.EndElement();
}
}
@@ -980,8 +953,7 @@ void cmVisualStudio10TargetGenerator::WriteTargetSpecificReferences(Elem& e0)
.Attribute("Project",
"$(MSBuildExtensionsPath)\\Microsoft\\WindowsPhone\\v"
"$(TargetPlatformVersion)\\Microsoft.Cpp.WindowsPhone."
- "$(TargetPlatformVersion).targets")
- .EndElement();
+ "$(TargetPlatformVersion).targets");
}
}
}
@@ -1004,8 +976,7 @@ void cmVisualStudio10TargetGenerator::WriteTargetsFileReferences(Elem& e1)
Elem(e1, "Import")
.Attribute("Project", tac.File)
- .Attribute("Condition", oss.str())
- .EndElement();
+ .Attribute("Condition", oss.str());
}
}
@@ -1028,9 +999,7 @@ void cmVisualStudio10TargetGenerator::WriteWinRTReferences(Elem& e0)
Elem e2(e1, "Reference");
e2.Attribute("Include", ri);
e2.Element("IsWinMDFile", "true");
- e2.EndElement();
}
- e1.EndElement();
}
}
@@ -1045,9 +1014,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurations(Elem& e0)
e2.Attribute("Include", c + "|" + this->Platform);
e2.Element("Configuration", c);
e2.Element("Platform", this->Platform);
- e2.EndElement();
}
- e1.EndElement();
}
void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues(Elem& e0)
@@ -1107,8 +1074,6 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues(Elem& e0)
} else if (this->NsightTegra) {
this->WriteNsightTegraConfigurationValues(e1, c);
}
-
- e1.EndElement();
}
}
@@ -1308,8 +1273,6 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule(
if (!link.empty()) {
e2.Element("Link", link);
}
- e2.EndElement();
- e1.EndElement();
}
for (std::string const& c : this->Configurations) {
cmCustomCommandGenerator ccg(command, c, lg);
@@ -1345,10 +1308,6 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule(
comment);
}
}
- if (this->ProjectType != csproj) {
- spe2->EndElement();
- spe1->EndElement();
- }
}
void cmVisualStudio10TargetGenerator::WriteCustomRuleCpp(
@@ -1381,10 +1340,9 @@ void cmVisualStudio10TargetGenerator::WriteCustomRuleCSharp(
e1.S << "\n Inputs=\"" << cmVS10EscapeAttr(inputs) << "\"";
e1.S << "\n Outputs=\"" << cmVS10EscapeAttr(outputs) << "\"";
if (!comment.empty()) {
- Elem(e1, "Exec").Attribute("Command", "echo " + comment).EndElement();
+ Elem(e1, "Exec").Attribute("Command", "echo " + comment);
}
- Elem(e1, "Exec").Attribute("Command", script).EndElement();
- e1.EndElement();
+ Elem(e1, "Exec").Attribute("Command", script);
}
std::string cmVisualStudio10TargetGenerator::ConvertPath(
@@ -1465,26 +1423,21 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
Elem e2(e1, "XML");
e2.Attribute("Include", oi);
e2.Element("Filter", "Resource Files");
- e2.EndElement();
} else if (cmSystemTools::GetFilenameExtension(fileName) ==
".appxmanifest") {
Elem e2(e1, "AppxManifest");
e2.Attribute("Include", oi);
e2.Element("Filter", "Resource Files");
- e2.EndElement();
} else if (cmSystemTools::GetFilenameExtension(fileName) == ".pfx") {
Elem e2(e1, "None");
e2.Attribute("Include", oi);
e2.Element("Filter", "Resource Files");
- e2.EndElement();
} else {
Elem e2(e1, "Image");
e2.Attribute("Include", oi);
e2.Element("Filter", "Resource Files");
- e2.EndElement();
}
}
- e1.EndElement();
}
std::vector<cmSourceFile const*> resxObjs;
@@ -1497,9 +1450,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
Elem e2(e1, "EmbeddedResource");
e2.Attribute("Include", obj);
e2.Element("Filter", "Resource Files");
- e2.EndElement();
}
- e1.EndElement();
}
{
Elem e1(e0, "ItemGroup");
@@ -1518,7 +1469,6 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
Elem e2(e1, "Filter");
e2.Attribute("Include", name);
e2.Element("UniqueIdentifier", "{" + guid + "}");
- e2.EndElement();
}
}
@@ -1531,12 +1481,8 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
e2.Element("Extensions",
"rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;"
"gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms");
- e2.EndElement();
}
-
- e1.EndElement();
}
- e0.EndElement();
}
fout << '\n';
@@ -1601,9 +1547,7 @@ void cmVisualStudio10TargetGenerator::WriteGroupSources(
if (!filter.empty()) {
e2.Element("Filter", filter);
}
- e2.EndElement();
}
- e1.EndElement();
}
void cmVisualStudio10TargetGenerator::WriteHeaderSource(Elem& e1,
@@ -1618,7 +1562,6 @@ void cmVisualStudio10TargetGenerator::WriteHeaderSource(Elem& e1,
std::string xamlFileName = fileName.substr(0, fileName.find_last_of("."));
e2.Element("DependentUpon", xamlFileName);
}
- e2.EndElement();
}
void cmVisualStudio10TargetGenerator::WriteExtraSource(Elem& e1,
@@ -1893,7 +1836,6 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(Elem& e1,
// write source file specific tags
this->WriteCSharpSourceProperties(e2, sourceFileTags);
}
- e2.EndElement();
}
void cmVisualStudio10TargetGenerator::WriteSource(Elem& e2,
@@ -2049,15 +1991,12 @@ void cmVisualStudio10TargetGenerator::WriteAllSources(Elem& e0)
if (!exclude_configs.empty()) {
this->WriteExcludeFromBuild(e2, exclude_configs);
}
- e2.EndElement();
}
}
if (this->IsMissingFiles) {
this->WriteMissingFiles(e1);
}
-
- e1.EndElement();
}
void cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
@@ -2360,7 +2299,6 @@ void cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions(
this->OutputLinkIncremental(e1, config);
}
}
- e1.EndElement();
}
void cmVisualStudio10TargetGenerator::OutputLinkIncremental(
@@ -2656,7 +2594,6 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
if (!clOptions.IsDebug()) {
Elem e3(e2, "DebugInformationFormat");
e3.SetHasElements();
- e3.EndElement();
}
// Specify the compiler program database file if configured.
@@ -2678,8 +2615,6 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
e2.Element("AdditionalUsingDirectories", dirs);
}
}
-
- e2.EndElement();
}
bool cmVisualStudio10TargetGenerator::ComputeRcOptions()
@@ -2733,8 +2668,6 @@ void cmVisualStudio10TargetGenerator::WriteRCOptions(
rcOptions.OutputAdditionalIncludeDirectories("RC");
rcOptions.PrependInheritedString("AdditionalOptions");
rcOptions.OutputFlagMap();
-
- e2.EndElement();
}
bool cmVisualStudio10TargetGenerator::ComputeCudaOptions()
@@ -2881,8 +2814,6 @@ void cmVisualStudio10TargetGenerator::WriteCudaOptions(
cudaOptions.OutputPreprocessorDefinitions("CUDA");
cudaOptions.PrependInheritedString("AdditionalOptions");
cudaOptions.OutputFlagMap();
-
- e2.EndElement();
}
bool cmVisualStudio10TargetGenerator::ComputeCudaLinkOptions()
@@ -2950,7 +2881,6 @@ void cmVisualStudio10TargetGenerator::WriteCudaLinkOptions(
Elem e2(e1, "CudaLink");
OptionsHelper cudaLinkOptions(*(this->CudaLinkOptions[configName]), e2);
cudaLinkOptions.OutputFlagMap();
- e2.EndElement();
}
bool cmVisualStudio10TargetGenerator::ComputeMasmOptions()
@@ -3006,8 +2936,6 @@ void cmVisualStudio10TargetGenerator::WriteMasmOptions(
masmOptions.OutputAdditionalIncludeDirectories("ASM_MASM");
masmOptions.PrependInheritedString("AdditionalOptions");
masmOptions.OutputFlagMap();
-
- e2.EndElement();
}
bool cmVisualStudio10TargetGenerator::ComputeNasmOptions()
@@ -3067,8 +2995,6 @@ void cmVisualStudio10TargetGenerator::WriteNasmOptions(
// Preprocessor definitions and includes are shared with clOptions.
OptionsHelper clOptions(*(this->ClOptions[configName]), e2);
clOptions.OutputPreprocessorDefinitions("ASM_NASM");
-
- e2.EndElement();
}
void cmVisualStudio10TargetGenerator::WriteLibOptions(
@@ -3091,7 +3017,6 @@ void cmVisualStudio10TargetGenerator::WriteLibOptions(
OptionsHelper oh(libOptions, e2);
oh.PrependInheritedString("AdditionalOptions");
oh.OutputFlagMap();
- e2.EndElement();
}
// We cannot generate metadata for static libraries. WindowsPhone
@@ -3101,7 +3026,6 @@ void cmVisualStudio10TargetGenerator::WriteLibOptions(
this->GlobalGenerator->TargetsWindowsStore()) {
Elem e2(e1, "Link");
e2.Element("GenerateWindowsMetadata", "false");
- e2.EndElement();
}
}
@@ -3125,7 +3049,6 @@ void cmVisualStudio10TargetGenerator::WriteManifestOptions(
}
Elem e2(e1, "Manifest");
e2.Element("AdditionalManifestFiles", oss.str());
- e2.EndElement();
}
}
@@ -3230,8 +3153,6 @@ void cmVisualStudio10TargetGenerator::WriteAntBuildOptions(
e2.Element("AdditionalOptions",
std::string(antAdditionalOptions) + " %(AdditionalOptions)");
}
-
- e2.EndElement();
}
bool cmVisualStudio10TargetGenerator::ComputeLinkOptions()
@@ -3528,14 +3449,12 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(
OptionsHelper linkOptions(*(this->LinkOptions[config]), e2);
linkOptions.PrependInheritedString("AdditionalOptions");
linkOptions.OutputFlagMap();
- e2.EndElement();
}
if (!this->GlobalGenerator->NeedLinkLibraryDependencies(
this->GeneratorTarget)) {
Elem e2(e1, "ProjectReference");
e2.Element("LinkLibraryDependencies", "false");
- e2.EndElement();
}
}
@@ -3661,7 +3580,6 @@ void cmVisualStudio10TargetGenerator::WriteMidlOptions(
e2.Element("TypeLibraryName", "%(Filename).tlb");
e2.Element("InterfaceIdentifierFileName", "%(Filename)_i.c");
e2.Element("ProxyFileName", "%(Filename)_p.c");
- e2.EndElement();
}
void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups(Elem& e0)
@@ -3700,7 +3618,6 @@ void cmVisualStudio10TargetGenerator::WriteItemDefinitionGroups(Elem& e0)
this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI")) {
this->WriteAntBuildOptions(e1, c);
}
- e1.EndElement();
}
}
@@ -3754,7 +3671,6 @@ void cmVisualStudio10TargetGenerator::WriteEvent(
Elem e2(e1, name);
e2.Element("Message", comment);
e2.Element("Command", script);
- e2.EndElement();
} else {
std::string strippedComment = comment;
strippedComment.erase(
@@ -3831,9 +3747,7 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences(Elem& e0)
e2.Element("CopyToOutputDirectory", "Never");
}
}
- e2.EndElement();
}
- e1.EndElement();
}
void cmVisualStudio10TargetGenerator::WritePlatformExtensions(Elem& e1)
@@ -3870,7 +3784,6 @@ void cmVisualStudio10TargetGenerator::WriteSinglePlatformExtension(
Elem e2(e1, "Import");
e2.Attribute("Project", s);
e2.Attribute("Condition", "exists('" + s + "')");
- e2.EndElement();
}
void cmVisualStudio10TargetGenerator::WriteSDKReferences(Elem& e0)
@@ -3884,7 +3797,7 @@ void cmVisualStudio10TargetGenerator::WriteSDKReferences(Elem& e0)
e1.StartElement("ItemGroup");
hasWrittenItemGroup = true;
for (std::string const& ri : sdkReferences) {
- Elem(e1, "SDKReference").Attribute("Include", ri).EndElement();
+ Elem(e1, "SDKReference").Attribute("Include", ri);
}
}
@@ -3916,16 +3829,13 @@ void cmVisualStudio10TargetGenerator::WriteSDKReferences(Elem& e0)
}
}
}
-
- e1.EndElement();
}
void cmVisualStudio10TargetGenerator::WriteSingleSDKReference(
Elem& e1, std::string const& extension, std::string const& version)
{
Elem(e1, "SDKReference")
- .Attribute("Include", extension + ", Version=" + version)
- .EndElement();
+ .Attribute("Include", extension + ", Version=" + version);
}
void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile(
@@ -3975,7 +3885,6 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile(
if (!thumb.empty()) {
e1.Element("PackageCertificateThumbprint", thumb);
}
- e1.EndElement();
} else if (!pfxFile.empty()) {
Elem e1(e0, "PropertyGroup");
e1.Element("PackageCertificateKeyFile", pfxFile);
@@ -3983,7 +3892,6 @@ void cmVisualStudio10TargetGenerator::WriteWinRTPackageCertificateKeyFile(
if (!thumb.empty()) {
e1.Element("PackageCertificateThumbprint", thumb);
}
- e1.EndElement();
}
}
}
@@ -4223,7 +4131,6 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80(Elem& e1)
Elem e2(e1, "Xml");
e2.Attribute("Include", sourceFile);
e2.Element("SubType", "Designer");
- e2.EndElement();
}
this->AddedFiles.push_back(sourceFile);
@@ -4231,13 +4138,13 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80(Elem& e1)
cmSystemTools::CopyAFile(templateFolder + "/SmallLogo.png", smallLogo,
false);
ConvertToWindowsSlash(smallLogo);
- Elem(e1, "Image").Attribute("Include", smallLogo).EndElement();
+ Elem(e1, "Image").Attribute("Include", smallLogo);
this->AddedFiles.push_back(smallLogo);
std::string logo = this->DefaultArtifactDir + "/Logo.png";
cmSystemTools::CopyAFile(templateFolder + "/Logo.png", logo, false);
ConvertToWindowsSlash(logo);
- Elem(e1, "Image").Attribute("Include", logo).EndElement();
+ Elem(e1, "Image").Attribute("Include", logo);
this->AddedFiles.push_back(logo);
std::string applicationIcon =
@@ -4245,7 +4152,7 @@ void cmVisualStudio10TargetGenerator::WriteMissingFilesWP80(Elem& e1)
cmSystemTools::CopyAFile(templateFolder + "/ApplicationIcon.png",
applicationIcon, false);
ConvertToWindowsSlash(applicationIcon);
- Elem(e1, "Image").Attribute("Include", applicationIcon).EndElement();
+ Elem(e1, "Image").Attribute("Include", applicationIcon);
this->AddedFiles.push_back(applicationIcon);
}
@@ -4500,7 +4407,6 @@ void cmVisualStudio10TargetGenerator::WriteCommonMissingFiles(
Elem e2(e1, "AppxManifest");
e2.Attribute("Include", sourceFile);
e2.Element("SubType", "Designer");
- e2.EndElement();
}
this->AddedFiles.push_back(sourceFile);
@@ -4508,34 +4414,34 @@ void cmVisualStudio10TargetGenerator::WriteCommonMissingFiles(
cmSystemTools::CopyAFile(templateFolder + "/SmallLogo.png", smallLogo,
false);
ConvertToWindowsSlash(smallLogo);
- Elem(e1, "Image").Attribute("Include", smallLogo).EndElement();
+ Elem(e1, "Image").Attribute("Include", smallLogo);
this->AddedFiles.push_back(smallLogo);
std::string smallLogo44 = this->DefaultArtifactDir + "/SmallLogo44x44.png";
cmSystemTools::CopyAFile(templateFolder + "/SmallLogo44x44.png", smallLogo44,
false);
ConvertToWindowsSlash(smallLogo44);
- Elem(e1, "Image").Attribute("Include", smallLogo44).EndElement();
+ Elem(e1, "Image").Attribute("Include", smallLogo44);
this->AddedFiles.push_back(smallLogo44);
std::string logo = this->DefaultArtifactDir + "/Logo.png";
cmSystemTools::CopyAFile(templateFolder + "/Logo.png", logo, false);
ConvertToWindowsSlash(logo);
- Elem(e1, "Image").Attribute("Include", logo).EndElement();
+ Elem(e1, "Image").Attribute("Include", logo);
this->AddedFiles.push_back(logo);
std::string storeLogo = this->DefaultArtifactDir + "/StoreLogo.png";
cmSystemTools::CopyAFile(templateFolder + "/StoreLogo.png", storeLogo,
false);
ConvertToWindowsSlash(storeLogo);
- Elem(e1, "Image").Attribute("Include", storeLogo).EndElement();
+ Elem(e1, "Image").Attribute("Include", storeLogo);
this->AddedFiles.push_back(storeLogo);
std::string splashScreen = this->DefaultArtifactDir + "/SplashScreen.png";
cmSystemTools::CopyAFile(templateFolder + "/SplashScreen.png", splashScreen,
false);
ConvertToWindowsSlash(splashScreen);
- Elem(e1, "Image").Attribute("Include", splashScreen).EndElement();
+ Elem(e1, "Image").Attribute("Include", splashScreen);
this->AddedFiles.push_back(splashScreen);
if (this->AddedDefaultCertificate) {
@@ -4543,7 +4449,7 @@ void cmVisualStudio10TargetGenerator::WriteCommonMissingFiles(
std::string keyFile =
this->DefaultArtifactDir + "/Windows_TemporaryKey.pfx";
ConvertToWindowsSlash(keyFile);
- Elem(e1, "None").Attribute("Include", keyFile).EndElement();
+ Elem(e1, "None").Attribute("Include", keyFile);
}
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=edf0ea9bb2a0ecd411e14d0c7e27089cc258048b
commit edf0ea9bb2a0ecd411e14d0c7e27089cc258048b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 25 10:03:03 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 25 10:03:03 2018 -0400
CUDA: Drop unused/broken platform link flags placeholder
The `<CMAKE_CUDA_LINK_FLAGS>` placeholder in CUDA rule variables comes
from the `<CMAKE_CXX_LINK_FLAGS>` placeholder from which the CUDA rule
variables were originally derived. It is not a public interface for
adding link flags so no projects should be using it. It is needed for
platform information modules to specify platform-specific link flags for
the language. None of our platform modules set it, so it is unused.
Furthermore, it is broken as currently implemented. Some of the
contexts in which it is used need `-Xlinker` and some do not.
Therefore it is not possible to use the placeholder at all.
Simply remove it for now. If some need for platform-specific CUDA link
flags arises a new solution will be needed.
diff --git a/Modules/CMakeCUDAInformation.cmake b/Modules/CMakeCUDAInformation.cmake
index 479493b..8e62941 100644
--- a/Modules/CMakeCUDAInformation.cmake
+++ b/Modules/CMakeCUDAInformation.cmake
@@ -168,7 +168,7 @@ endif()
# compile a cu file into an executable
if(NOT CMAKE_CUDA_LINK_EXECUTABLE)
set(CMAKE_CUDA_LINK_EXECUTABLE
- "<CMAKE_CUDA_HOST_LINK_LAUNCHER> <CMAKE_CUDA_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>${__IMPLICT_LINKS}")
+ "<CMAKE_CUDA_HOST_LINK_LAUNCHER> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>${__IMPLICT_LINKS}")
endif()
if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0")
@@ -194,11 +194,11 @@ unset(__IMPLICT_DLINK_DIRS)
#These are used when linking relocatable (dc) cuda code
if(NOT CMAKE_CUDA_DEVICE_LINK_LIBRARY)
set(CMAKE_CUDA_DEVICE_LINK_LIBRARY
- "<CMAKE_CUDA_COMPILER> ${CMAKE_CUDA_HOST_FLAGS} <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>${__IMPLICT_DLINK_FLAGS}")
+ "<CMAKE_CUDA_COMPILER> ${CMAKE_CUDA_HOST_FLAGS} <LANGUAGE_COMPILE_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>${__IMPLICT_DLINK_FLAGS}")
endif()
if(NOT CMAKE_CUDA_DEVICE_LINK_EXECUTABLE)
set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
- "<CMAKE_CUDA_COMPILER> ${CMAKE_CUDA_HOST_FLAGS} <FLAGS> <CMAKE_CUDA_LINK_FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>${__IMPLICT_DLINK_FLAGS}")
+ "<CMAKE_CUDA_COMPILER> ${CMAKE_CUDA_HOST_FLAGS} <FLAGS> ${CMAKE_CUDA_COMPILE_OPTIONS_PIC} ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES>${__IMPLICT_DLINK_FLAGS}")
endif()
unset(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS)
diff --git a/Modules/Platform/Windows-NVIDIA-CUDA.cmake b/Modules/Platform/Windows-NVIDIA-CUDA.cmake
index 0c11e55..f1c1f2d 100644
--- a/Modules/Platform/Windows-NVIDIA-CUDA.cmake
+++ b/Modules/Platform/Windows-NVIDIA-CUDA.cmake
@@ -15,7 +15,7 @@ foreach(lib ${CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES})
string(APPEND __IMPLICT_LINKS " \"${lib}\"")
endforeach()
set(CMAKE_CUDA_LINK_EXECUTABLE
- "<CMAKE_CUDA_HOST_LINK_LAUNCHER> <CMAKE_CUDA_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <LINK_LIBRARIES>${__IMPLICT_LINKS}")
+ "<CMAKE_CUDA_HOST_LINK_LAUNCHER> <LINK_FLAGS> <OBJECTS> /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <LINK_LIBRARIES>${__IMPLICT_LINKS}")
set(_CMAKE_VS_LINK_DLL "<CMAKE_COMMAND> -E vs_link_dll --intdir=<OBJECT_DIR> --manifests <MANIFESTS> -- ")
set(_CMAKE_VS_LINK_EXE "<CMAKE_COMMAND> -E vs_link_exe --intdir=<OBJECT_DIR> --manifests <MANIFESTS> -- ")
@@ -26,7 +26,7 @@ set(CMAKE_CUDA_CREATE_SHARED_MODULE ${CMAKE_CUDA_CREATE_SHARED_LIBRARY})
set(CMAKE_CUDA_CREATE_STATIC_LIBRARY "<CMAKE_LINKER> /lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /out:<TARGET> <OBJECTS> ")
set(CMAKE_CUDA_LINKER_SUPPORTS_PDB ON)
set(CMAKE_CUDA_LINK_EXECUTABLE
- "${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <CMAKE_CUDA_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${__IMPLICT_LINKS} ${CMAKE_END_TEMP_FILE}")
+ "${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <LINK_FLAGS> <LINK_LIBRARIES>${__IMPLICT_LINKS} ${CMAKE_END_TEMP_FILE}")
unset(_CMAKE_VS_LINK_EXE)
unset(_CMAKE_VS_LINK_EXE)
@@ -51,9 +51,9 @@ endforeach()
unset(__IMPLICT_DLINK_DIRS)
set(CMAKE_CUDA_DEVICE_LINK_LIBRARY
- "<CMAKE_CUDA_COMPILER> <CMAKE_CUDA_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS${__IMPLICT_DLINK_FLAGS}")
+ "<CMAKE_CUDA_COMPILER> <LANGUAGE_COMPILE_FLAGS> ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS${__IMPLICT_DLINK_FLAGS}")
set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
- "<CMAKE_CUDA_COMPILER> <FLAGS> <CMAKE_CUDA_LINK_FLAGS> ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS${__IMPLICT_DLINK_FLAGS}")
+ "<CMAKE_CUDA_COMPILER> <FLAGS> ${_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS} -shared -dlink <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS${__IMPLICT_DLINK_FLAGS}")
unset(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS)
unset(__IMPLICT_DLINK_FLAGS)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f994d9fdcf70ea16a5a3812d2151d9b7f27f784
commit 1f994d9fdcf70ea16a5a3812d2151d9b7f27f784
Author: Shane Parris <shane.lee.parris at gmail.com>
AuthorDate: Fri May 25 09:29:53 2018 -0400
Commit: Shane Parris <shane.lee.parris at gmail.com>
CommitDate: Fri May 25 09:29:53 2018 -0400
bootstrap: Use ccache in script-generated makefile
diff --git a/bootstrap b/bootstrap
index 6604f54..0aa600d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1250,6 +1250,12 @@ else
echo "${cmake_cxx_compiler} does not have <ext/stdio_filebuf.h>"
fi
+if [ -n "${cmake_ccache_enabled}" ]; then
+ echo "Building CMake with ccache"
+ cmake_c_compiler="ccache ${cmake_c_compiler}"
+ cmake_cxx_compiler="ccache ${cmake_cxx_compiler}"
+fi
+
# Just to be safe, let us store compiler and flags to the header file
cmake_bootstrap_version='$Revision$'
@@ -1536,10 +1542,6 @@ cd "${cmake_binary_dir}"
# build with same compiler and make
CC="${cmake_c_compiler}"
CXX="${cmake_cxx_compiler}"
-if [ -n "${cmake_ccache_enabled}" ]; then
- CC="ccache ${CC}"
- CXX="ccache ${CXX}"
-fi
MAKE="${cmake_make_processor}"
export CC
export CXX
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=726c09029729673cf66386bafb7152b2d3b55466
commit 726c09029729673cf66386bafb7152b2d3b55466
Author: Vitaly Stakhovsky <vvs31415 at gitlab.org>
AuthorDate: Tue May 22 11:01:54 2018 -0400
Commit: Vitaly Stakhovsky <vvs31415 at gitlab.org>
CommitDate: Fri May 25 09:28:54 2018 -0400
cmVisualStudio10TargetGenerator: close XML tag in Elem destructor
RAII actually implemented; EndElement() still kept to avoid major reformatting
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index fa6c8ad..b373dce 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -42,6 +42,7 @@ struct cmVisualStudio10TargetGenerator::Elem
std::ostream& S;
const int Indent;
bool HasElements = false;
+ bool HasContent = false;
std::string Tag;
Elem(std::ostream& s)
@@ -79,8 +80,7 @@ struct cmVisualStudio10TargetGenerator::Elem
}
void Element(const char* tag, const std::string& val)
{
- Elem(*this).WriteString("<") << tag << ">" << cmVS10EscapeXML(val) << "</"
- << tag << ">\n";
+ Elem(*this, tag).Content(val);
}
Elem& Attribute(const char* an, const std::string& av)
{
@@ -88,13 +88,17 @@ struct cmVisualStudio10TargetGenerator::Elem
return *this;
}
// This method for now assumes that this->Tag has been set, e.g. by calling
- // StartElement(). Also, it finishes the element so it should be the last
- // one called
+ // StartElement().
void Content(const std::string& val)
{
- S << ">" << cmVS10EscapeXML(val) << "</" << this->Tag << ">\n";
+ if (!this->HasContent) {
+ this->S << ">";
+ this->HasContent = true;
+ }
+ this->S << cmVS10EscapeXML(val);
}
- void EndElement()
+ void EndElement() {}
+ ~Elem()
{
// Do not emit element which has not been started
if (Tag.empty()) {
@@ -108,6 +112,8 @@ struct cmVisualStudio10TargetGenerator::Elem
} else {
// special case: don't print EOL at EOF
}
+ } else if (HasContent) {
+ this->S << "</" << this->Tag << ">\n";
} else {
this->S << " />\n";
}
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCUDAInformation.cmake | 6 +-
Modules/Platform/Windows-NVIDIA-CUDA.cmake | 8 +-
Source/cmVisualStudio10TargetGenerator.cxx | 172 +++++++---------------------
bootstrap | 10 +-
4 files changed, 55 insertions(+), 141 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list