mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 14:23:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'autogen-fixes'

Browse Source 
09035319 Autogen: Pass explicit predefines header to moc if possible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !671
This commit is contained in:
Brad King
2017-04-21 12:42:38 +00:00
committed by Kitware Robot
parent 1b0c7bca5e 0903531964
commit 2b7aecba16
6 changed files with 111 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmQtAutoGenerators.h
+6 -2
View File
@@ -143,8 +143,8 @@ private:
const char* basePrefix,
const char* baseSuffix) const;
bool MakeParentDirectory(const std::string& filename) const;
bool RunCommand(const std::vector<std::string>& command,
std::string& output) const;
bool RunCommand(const std::vector<std::string>& command, std::string& output,
bool verbose = true) const;
bool FindHeader(std::string& header, const std::string& testBasePath) const;
@@ -177,6 +177,8 @@ private:
// - Moc
std::string MocCppFilenameRel;
std::string MocCppFilenameAbs;
std::string MocPredefsFileRel;
std::string MocPredefsFileAbs;
std::vector<std::string> MocSkipList;
std::vector<std::string> MocIncludePaths;
std::vector<std::string> MocIncludes;
@@ -198,6 +200,8 @@ private:
MacroFilter MacroFilters[2];
cmsys::RegularExpression RegExpMocInclude;
cmsys::RegularExpression RegExpUicInclude;
// - moc_predefs
std::vector<std::string> MocPredefsCmd;
// - Flags
bool IncludeProjectDirsBefore;
bool Verbose;