diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2018-11-27 12:15:05 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2018-11-28 12:07:27 (GMT) |
| commit | 5f0f84c7e0630d7b8190c18badd5a68e2dd08ff7 (patch) | |
| tree | 519f7a100cb4971fb201797649629e9bebba3390 /Source/cmQtAutoGeneratorMocUic.cxx | |
| parent | 0814d74548cda4e2e10183ed84ed8d0c4ff058fb (diff) | |
| download | CMake-5f0f84c7e0630d7b8190c18badd5a68e2dd08ff7.zip CMake-5f0f84c7e0630d7b8190c18badd5a68e2dd08ff7.tar.gz CMake-5f0f84c7e0630d7b8190c18badd5a68e2dd08ff7.tar.bz2 | |
Autogen: Don't add a WIN32 moc definition if we have a moc_predefs.h file
On Windows systems we used to add a "-DWIN32" definition to the ``moc``
defines. This is not necessary anymore when we have a
``moc_predefs.h`` file that provides all compiler predefines.
Closes #18623
Diffstat (limited to 'Source/cmQtAutoGeneratorMocUic.cxx')
| -rw-r--r-- | Source/cmQtAutoGeneratorMocUic.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Source/cmQtAutoGeneratorMocUic.cxx b/Source/cmQtAutoGeneratorMocUic.cxx index 2e6f90f..446ef9a 100644 --- a/Source/cmQtAutoGeneratorMocUic.cxx +++ b/Source/cmQtAutoGeneratorMocUic.cxx @@ -1279,16 +1279,6 @@ bool cmQtAutoGeneratorMocUic::Init(cmMakefile* makefile) Moc_.SkipList.insert(lst.begin(), lst.end()); } Moc_.Definitions = InfoGetConfigList("AM_MOC_DEFINITIONS"); -#ifdef _WIN32 - { - std::string win32("WIN32"); - auto itB = Moc().Definitions.cbegin(); - auto itE = Moc().Definitions.cend(); - if (std::find(itB, itE, win32) == itE) { - Moc_.Definitions.emplace_back(std::move(win32)); - } - } -#endif Moc_.IncludePaths = InfoGetConfigList("AM_MOC_INCLUDES"); Moc_.Options = InfoGetList("AM_MOC_OPTIONS"); Moc_.RelaxedMode = InfoGetBool("AM_MOC_RELAXED_MODE"); |