diff options
author | Brad King <brad.king@kitware.com> | 2022-09-09 13:49:55 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-09 13:50:05 (GMT) |
commit | 39d2ceb4f1110b87534e86418ebd23539d752f66 (patch) | |
tree | 2f363ec7c869c793992d76d2cf6096e00da3046f | |
parent | 45b7628a0296e3098ad2e5dedd6e2e053192d4cb (diff) | |
parent | e08d34eda13ac6e856f7038a09aa52cc92612a64 (diff) | |
download | CMake-39d2ceb4f1110b87534e86418ebd23539d752f66.zip CMake-39d2ceb4f1110b87534e86418ebd23539d752f66.tar.gz CMake-39d2ceb4f1110b87534e86418ebd23539d752f66.tar.bz2 |
Merge topic 'revert-automoc-silence-warnings'
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.cxx | 11 |
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; |