From 8e452e67e9a9e8762e924bdb502b9a59d2d29dc4 Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Tue, 22 Aug 2017 15:59:10 +0200 Subject: Remove AUTOGEN variables from cmSourceFile and cmMakefile --- Source/cmMakefile.cxx | 10 ---------- Source/cmMakefile.h | 5 ----- Source/cmSourceFile.cxx | 9 --------- Source/cmSourceFile.h | 1 - 4 files changed, 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 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 GetQtUiFilesWithOptions() const; - std::set const& GetSystemIncludeDirectories() const { return this->SystemIncludeDirectories; @@ -917,8 +914,6 @@ private: void UpdateOutputToSourceMap(std::string const& output, cmSourceFile* source); - std::vector 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(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 Depends; bool FindFullPathFailed; - bool IsUiFile; bool FindFullPath(std::string* error); bool TryFullPath(const std::string& path, const std::string& ext); -- cgit v0.12