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

Merge topic 'automoc-silence-warnings'

Browse Source 
844244ccdc automoc: avoid compiler warnings in linker-warning-silencing code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7558
This commit is contained in:
Brad King
2022-08-16 16:40:31 +00:00
committed by Kitware Robot
parent 9ce5018be9 844244ccdc
commit c082c5c167
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmQtAutoMocUic.cxx
View File

@@ -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()) {