Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 22:37:30 +08:00
Code Issues Projects Releases Wiki Activity

Remove AUTOGEN variables from cmSourceFile and cmMakefile

Browse Source
This commit is contained in:
Sebastian Holtermann
2017-08-22 15:59:10 +02:00
parent 0f2e178f65
commit 8e452e67e9
4 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmMakefile.cxx
View File

@@ -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",

5
Source/cmMakefile.h
View File

@@ -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;

9
Source/cmSourceFile.cxx
View File

@@ -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,

1
Source/cmSourceFile.h
View File

@@ -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);