summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-09-09 13:49:55 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-09-09 13:50:04 (GMT)
commit11754888a88362710dc2bdfed6211fd67d621f58 (patch)
tree2e204fe35dff68a0b73bd94ecfe4603788d8d2b3
parentdac4f2691856f9a0adbe8765d8a4d3a4edf6495e (diff)
parente08d34eda13ac6e856f7038a09aa52cc92612a64 (diff)
downloadCMake-11754888a88362710dc2bdfed6211fd67d621f58.zip
CMake-11754888a88362710dc2bdfed6211fd67d621f58.tar.gz
CMake-11754888a88362710dc2bdfed6211fd67d621f58.tar.bz2
Merge topic 'revert-automoc-silence-warnings' into release-3.24
e08d34eda1 automoc: revert attempts to silence linker warning on macos Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7652
-rw-r--r--Source/cmQtAutoMocUic.cxx11
1 files changed, 1 insertions, 10 deletions
diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx
index 8adaa6c..4753e61 100644
--- a/Source/cmQtAutoMocUic.cxx
+++ b/Source/cmQtAutoMocUic.cxx
@@ -2175,18 +2175,9 @@ void cmQtAutoMocUicT::JobMocsCompilationT::Process()
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"
- "void " +
- functionName +
- "();\n"
- "void " +
- functionName + "() {}\n";
+ "enum some_compilers { need_more_than_nothing };\n";
} else {
// Valid content
const bool mc = this->BaseConst().MultiConfig;