diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-23 12:20:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-23 12:21:27 (GMT) |
| commit | fc1aaf14329571c8cd58b3e1b85fbb434f8277b3 (patch) | |
| tree | 4e68d4e05fd4350d347d6b22d43bcc91c44ca374 /Source/cmMakefile.h | |
| parent | ac6660b6716f14815bdd0f75cf1da4cf3ad7381c (diff) | |
| parent | 8e452e67e9a9e8762e924bdb502b9a59d2d29dc4 (diff) | |
| download | CMake-fc1aaf14329571c8cd58b3e1b85fbb434f8277b3.zip CMake-fc1aaf14329571c8cd58b3e1b85fbb434f8277b3.tar.gz CMake-fc1aaf14329571c8cd58b3e1b85fbb434f8277b3.tar.bz2 | |
Merge topic 'autogen-optimize-cleanup'
8e452e67 Remove AUTOGEN variables from cmSourceFile and cmMakefile
0f2e178f Autogen: Don't use cmMakefile::GetQtUiFilesWithOptions
13bb716f Autogen: Fix and extend SKIP_AUTOMOC test
727247c3 Autogen: Read skip files from makefile
1eb1b409 Autogen: Remove VS specific code exclusion
54ec2a8b Autogen: Initializer file type scanning optimizations
cf7b3b96 Autogen: Initializer optimizations and cleanups
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1171
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 35cda6d..059a4e7 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -736,9 +736,6 @@ public: cmStringRange GetCompileDefinitionsEntries() const; cmBacktraceRange GetCompileDefinitionsBacktraces() const; - void AddQtUiFileWithOptions(cmSourceFile* sf); - std::vector<cmSourceFile*> GetQtUiFilesWithOptions() const; - std::set<std::string> const& GetSystemIncludeDirectories() const { return this->SystemIncludeDirectories; @@ -917,8 +914,6 @@ private: void UpdateOutputToSourceMap(std::string const& output, cmSourceFile* source); - std::vector<cmSourceFile*> QtUiFilesWithOptions; - bool AddRequiredTargetCFeature(cmTarget* target, const std::string& feature, std::string* error = CM_NULLPTR) const; |