diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-04-19 08:15:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-04-22 12:49:22 (GMT) |
| commit | 488ea8c7093849cc60ae0e99ef883b2ddacfdf86 (patch) | |
| tree | 7b0527f8ab8edd6babb3fdbfad38fc8c0d17a00d /Source/cmQtAutoGenerators.h | |
| parent | 66caae45f615e03c49a87cb17901fd89ffd389af (diff) | |
| download | CMake-488ea8c7093849cc60ae0e99ef883b2ddacfdf86.zip CMake-488ea8c7093849cc60ae0e99ef883b2ddacfdf86.tar.gz CMake-488ea8c7093849cc60ae0e99ef883b2ddacfdf86.tar.bz2 | |
Autogen: Generate not included moc files in subdirectories (#12873)
Not included moc files generated from a source file in
CMAKE_CURRENT_SOURCE_DIR/SUBDIR
will be generated in the directory
CMAKE_CURRENT_BINARY_DIR/TARGETNAME_automoc.dir/SUBDIR/
Diffstat (limited to 'Source/cmQtAutoGenerators.h')
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index d529bf9..422e1ed 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -78,6 +78,8 @@ private: void Init(); + std::string SourceRelativePath(const std::string& filename); + bool NameCollisionTest(const std::map<std::string, std::string >& genFiles, std::multimap<std::string, std::string>& collisions ); void NameCollisionLog( @@ -114,8 +116,9 @@ private: std::string CurrentCompileSettingsStr; std::string OldCompileSettingsStr; + std::string TargetBuildSubDir; std::string OutMocCppFilenameRel; - std::string OutMocCppFilename; + std::string OutMocCppFilenameAbs; std::list<std::string> MocIncludes; std::list<std::string> MocDefinitions; std::vector<std::string> MocOptions; |