mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Autogen: Add -DWIN32 to definitions list on demand

Browse Source
This commit is contained in:
Sebastian Holtermann
2017-05-13 10:25:46 +02:00
parent ab39dd11f5
commit b95fbbe553
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmQtAutoGenerators.cxx
View File

@@ -396,6 +396,14 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
if (this->MocEnabled()) {
InfoGet(makefile, "AM_MOC_SKIP", this->MocSkipList);
InfoGet(makefile, "AM_MOC_DEFINITIONS", config, this->MocDefinitions);
#ifdef _WIN32
{
const std::string win32("WIN32");
if (!ListContains(this->MocDefinitions, win32)) {
this->MocDefinitions.push_back(win32);
}
}
#endif
InfoGet(makefile, "AM_MOC_INCLUDES", config, this->MocIncludePaths);
InfoGet(makefile, "AM_MOC_OPTIONS", this->MocOptions);
InfoGet(makefile, "AM_MOC_RELAXED_MODE", this->MocRelaxedMode);
@@ -1221,9 +1229,6 @@ bool cmQtAutoGenerators::MocGenerateAll(
this->MocDefinitions.begin();
it != this->MocDefinitions.end(); ++it) {
cmd.push_back("-D" + (*it));
#ifdef _WIN32
cmd.push_back("-DWIN32");
#endif
}
// Add options
cmd.insert(cmd.end(), this->MocOptions.begin(),
@@ -1369,9 +1374,6 @@ bool cmQtAutoGenerators::MocGenerateFile(
it != this->MocDefinitions.end(); ++it) {
cmd.push_back("-D" + (*it));
}
#ifdef _WIN32
cmd.push_back("-DWIN32");
#endif
// Add options
cmd.insert(cmd.end(), this->MocOptions.begin(), this->MocOptions.end());
// Add predefs include