mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 03:29:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Autogen: Offer solution for CMP0071 in warning message

Browse Source
This commit is contained in:
Sebastian Holtermann
2017-09-26 18:28:46 +02:00
parent 825baaa1b3
commit b0775c751b
1 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmQtAutoGeneratorInitializer.cxx
+37 -28
View File
@@ -662,23 +662,24 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
{ {
std::vector<std::string> toolNames; std::vector<std::string> toolNames;
if (digest.MocEnabled) { if (digest.MocEnabled) {
toolNames.push_back("MOC"); toolNames.emplace_back("MOC");
} }
if (digest.UicEnabled) { if (digest.UicEnabled) {
toolNames.push_back("UIC"); toolNames.emplace_back("UIC");
} }
if (digest.RccEnabled) { if (digest.RccEnabled) {
toolNames.push_back("RCC"); toolNames.emplace_back("RCC");
} }
std::string tools = toolNames[0]; std::string tools = toolNames.front();
toolNames.erase(toolNames.begin()); toolNames.erase(toolNames.begin());
while (toolNames.size() > 1) { if (!toolNames.empty()) {
tools += ", " + toolNames[0]; while (toolNames.size() > 1) {
toolNames.erase(toolNames.begin()); tools += ", ";
} tools += toolNames.front();
if (toolNames.size() == 1) { toolNames.erase(toolNames.begin());
tools += " and " + toolNames[0]; }
tools += " and " + toolNames.front();
} }
autogenComment = "Automatic " + tools + " for target " + target->GetName(); autogenComment = "Automatic " + tools + " for target " + target->GetName();
} }
@@ -809,27 +810,35 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
msg += cmPolicies::GetPolicyWarning(cmPolicies::CMP0071); msg += cmPolicies::GetPolicyWarning(cmPolicies::CMP0071);
msg += "\n"; msg += "\n";
std::string tools; std::string tools;
if (digest.MocEnabled) { std::string property;
tools += "AUTOMOC"; if (digest.MocEnabled && digest.UicEnabled) {
tools = "AUTOMOC and AUTOUIC";
property = "SKIP_AUTOGEN";
} else if (digest.MocEnabled) {
tools = "AUTOMOC";
property = "SKIP_AUTOMOC";
} else if (digest.UicEnabled) {
tools = "AUTOUIC";
property = "SKIP_AUTOUIC";
} }
if (digest.UicEnabled) { msg += "For compatibility, CMake is excluding the GENERATED source "
if (!tools.empty()) { "file(s):\n";
tools += ","; for (const std::string& absFile : generatedHeaders) {
} msg.append(" ").append(cmQtAutoGen::Quoted(absFile)).append("\n");
tools += "AUTOUIC";
} }
if (!generatedHeaders.empty()) { for (const std::string& absFile : generatedSources) {
msg.append(tools).append(": Ignoring GENERATED header file(s):\n"); msg.append(" ").append(cmQtAutoGen::Quoted(absFile)).append("\n");
for (std::string const& absFile : generatedHeaders) {
msg.append(" ").append(cmQtAutoGen::Quoted(absFile)).append("\n");
}
}
if (!generatedSources.empty()) {
msg.append(tools).append(": Ignoring GENERATED source file(s):\n");
for (std::string const& absFile : generatedSources) {
msg.append(" ").append(cmQtAutoGen::Quoted(absFile)).append("\n");
}
} }
msg += "from processing by ";
msg += tools;
msg +=
". If any of the files should be processed, set CMP0071 to NEW. "
"If any of the files should not be processed, "
"explicitly exclude them by setting the source file property ";
msg += property;
msg += ":\n set_property(SOURCE file.h PROPERTY ";
msg += property;
msg += " ON)\n";
makefile->IssueMessage(cmake::AUTHOR_WARNING, msg); makefile->IssueMessage(cmake::AUTHOR_WARNING, msg);
} }
} }