diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-22 16:16:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-11-22 16:16:44 (GMT) |
| commit | 30d1850d7a7890f3786d99f9af1f8a12c5f655fa (patch) | |
| tree | 251728bdcc5e8c889bc1e2e65142854463f08168 | |
| parent | 002e402489483850e011161080958889897d46ff (diff) | |
| parent | 1e550ad02d7aaf3a0c89998cc6b67a271d505448 (diff) | |
| download | CMake-30d1850d7a7890f3786d99f9af1f8a12c5f655fa.zip CMake-30d1850d7a7890f3786d99f9af1f8a12c5f655fa.tar.gz CMake-30d1850d7a7890f3786d99f9af1f8a12c5f655fa.tar.bz2 | |
Merge topic 'automoc-cross-windows'
1e550ad02d AutoMoc: Only add the WIN32 define if the target system is Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6751
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 64d8ea9..c2a37fe 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -636,12 +636,12 @@ bool cmQtAutoGenInitializer::InitMoc() auto getDefs = [this](std::string const& cfg) -> std::set<std::string> { std::set<std::string> defines; this->LocalGen->GetTargetDefines(this->GenTarget, cfg, "CXX", defines); -#ifdef _WIN32 - if (this->Moc.PredefsCmd.empty()) { + if (this->Moc.PredefsCmd.empty() && + this->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME") == + "Windows") { // Add WIN32 definition if we don't have a moc_predefs.h defines.insert("WIN32"); } -#endif return defines; }; |