diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-08-22 13:59:10 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-08-22 17:10:32 (GMT) |
commit | 8e452e67e9a9e8762e924bdb502b9a59d2d29dc4 (patch) | |
tree | 12fcca19400f39343d5502c17d83ba90736c898e /Source | |
parent | 0f2e178f6528c9cd20f4d6a68c0e5e068cd64f58 (diff) | |
download | CMake-8e452e67e9a9e8762e924bdb502b9a59d2d29dc4.zip CMake-8e452e67e9a9e8762e924bdb502b9a59d2d29dc4.tar.gz CMake-8e452e67e9a9e8762e924bdb502b9a59d2d29dc4.tar.bz2 |
Remove AUTOGEN variables from cmSourceFile and cmMakefile
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmMakefile.cxx | 10 | ||||
-rw-r--r-- | Source/cmMakefile.h | 5 | ||||
-rw-r--r-- | Source/cmSourceFile.cxx | 9 | ||||
-rw-r--r-- | Source/cmSourceFile.h | 1 |
4 files changed, 0 insertions, 25 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index cb6cf2d..29999e9 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3902,16 +3902,6 @@ bool cmMakefile::EnforceUniqueDir(const std::string& srcPath, return false; } -void cmMakefile::AddQtUiFileWithOptions(cmSourceFile* sf) -{ - this->QtUiFilesWithOptions.push_back(sf); -} - -std::vector<cmSourceFile*> cmMakefile::GetQtUiFilesWithOptions() const -{ - return this->QtUiFilesWithOptions; -} - static std::string const matchVariables[] = { "CMAKE_MATCH_0", "CMAKE_MATCH_1", "CMAKE_MATCH_2", "CMAKE_MATCH_3", "CMAKE_MATCH_4", "CMAKE_MATCH_5", "CMAKE_MATCH_6", "CMAKE_MATCH_7", diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index e65ba46..f9ac7e2 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; diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx index 5c4f18b..baf95c5 100644 --- a/Source/cmSourceFile.cxx +++ b/Source/cmSourceFile.cxx @@ -17,8 +17,6 @@ cmSourceFile::cmSourceFile(cmMakefile* mf, const std::string& name) { this->CustomCommand = CM_NULLPTR; this->FindFullPathFailed = false; - this->IsUiFile = (".ui" == cmSystemTools::GetFilenameLastExtension( - this->Location.GetName())); } cmSourceFile::~cmSourceFile() @@ -245,13 +243,6 @@ bool cmSourceFile::Matches(cmSourceFileLocation const& loc) void cmSourceFile::SetProperty(const std::string& prop, const char* value) { this->Properties.SetProperty(prop, value); - - if (this->IsUiFile) { - cmMakefile const* mf = this->Location.GetMakefile(); - if (prop == "AUTOUIC_OPTIONS") { - const_cast<cmMakefile*>(mf)->AddQtUiFileWithOptions(this); - } - } } void cmSourceFile::AppendProperty(const std::string& prop, const char* value, diff --git a/Source/cmSourceFile.h b/Source/cmSourceFile.h index e739d18..91f783d 100644 --- a/Source/cmSourceFile.h +++ b/Source/cmSourceFile.h @@ -107,7 +107,6 @@ private: std::string ObjectLibrary; std::vector<std::string> Depends; bool FindFullPathFailed; - bool IsUiFile; bool FindFullPath(std::string* error); bool TryFullPath(const std::string& path, const std::string& ext); |