diff options
author | Alex Neundorf <neundorf@kde.org> | 2012-08-27 19:39:50 (GMT) |
---|---|---|
committer | Alex Neundorf <neundorf@kde.org> | 2012-08-27 19:39:50 (GMT) |
commit | b001b6e129134e88dc958cecbcd4c326e8daf36a (patch) | |
tree | b16d2512109718aa490bb4c728135a529fe11748 /Source/cmQtAutomoc.h | |
parent | c478d55e31e65205e4948bf8b487363891a638a4 (diff) | |
download | CMake-b001b6e129134e88dc958cecbcd4c326e8daf36a.zip CMake-b001b6e129134e88dc958cecbcd4c326e8daf36a.tar.gz CMake-b001b6e129134e88dc958cecbcd4c326e8daf36a.tar.bz2 |
fix #13494: rerun automoc also if include dirs or moc options change
Until now it was only rerun if the compile definitions changed, but
of course it also has to rerun if the include dirs or moc options
change. Strange that I didn't notice this before...
Alex
Diffstat (limited to 'Source/cmQtAutomoc.h')
-rw-r--r-- | Source/cmQtAutomoc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmQtAutomoc.h b/Source/cmQtAutomoc.h index 8cbbac1..f6d72e2 100644 --- a/Source/cmQtAutomoc.h +++ b/Source/cmQtAutomoc.h @@ -35,6 +35,8 @@ private: const char* targetDirectory); void WriteOldMocDefinitionsFile(const char* targetDirectory); + std::string MakeCompileSettingsString(cmMakefile* makefile); + bool RunAutomoc(); bool GenerateMoc(const std::string& sourceFile, const std::string& mocFileName); @@ -74,7 +76,8 @@ private: std::string ProjectSourceDir; std::string TargetName; - std::string OldMocDefinitionsStr; + std::string CurrentCompileSettingsStr; + std::string OldCompileSettingsStr; std::string OutMocCppFilename; std::list<std::string> MocIncludes; |