summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2022-08-10 18:01:31 +0200
committerAlbert Astals Cid <aacid@kde.org>2022-08-10 22:03:11 +0200
commit844244ccdc020f8b16d02478ceb4f79fd696aed6 (patch)
treea05040051e8b8e2ce16e0493a2246a68db0f05ed
parent425f6a0ef6c3fd86d3ed5f12f03e68b01976f036 (diff)
downloadcmake-844244ccdc020f8b16d02478ceb4f79fd696aed6.tar.gz
automoc: avoid compiler warnings in linker-warning-silencing code
Revise the code added by !7296 (merged). Make cmake_automoc_silence_linker_warning less warning-y. Fix weak-tables clang warning and copyable-polymorph clazy warning. Fixes: #23823
-rw-r--r--Source/cmQtAutoMocUic.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx
index a7125b1706..8c09b56990 100644
--- a/Source/cmQtAutoMocUic.cxx
+++ b/Source/cmQtAutoMocUic.cxx
@@ -2167,22 +2167,23 @@ void cmQtAutoMocUicT::JobCompileUicT::Process()
void cmQtAutoMocUicT::JobMocsCompilationT::Process()
{
+ std::string const& compAbs = this->MocConst().CompFileAbs;
+
// Compose mocs compilation file content
std::string content =
"// This file is autogenerated. Changes will be overwritten.\n";
if (this->MocEval().CompFiles.empty()) {
// Placeholder content
+ cmCryptoHash hash(cmCryptoHash::AlgoSHA256);
+ const std::string hashedPath = hash.HashString(compAbs);
+ const std::string functionName =
+ "cmake_automoc_silence_linker_warning" + hashedPath;
+
content += "// No files found that require moc or the moc files are "
"included\n"
- "struct cmake_automoc_silence_linker_warning{\n"
- " virtual ~cmake_automoc_silence_linker_warning();\n"
- "};\n"
- "\n"
- "inline "
- "cmake_automoc_silence_linker_warning::"
- "~cmake_automoc_silence_linker_warning()\n"
- "{}\n";
+ "void " +
+ functionName + "() {}\n";
} else {
// Valid content
const bool mc = this->BaseConst().MultiConfig;
@@ -2191,7 +2192,6 @@ void cmQtAutoMocUicT::JobMocsCompilationT::Process()
content += cmWrap(wrapFront, this->MocEval().CompFiles, wrapBack, "");
}
- std::string const& compAbs = this->MocConst().CompFileAbs;
if (cmQtAutoGenerator::FileDiffers(compAbs, content)) {
// Actually write mocs compilation file
if (this->Log().Verbose()) {