kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Remove AddExtraDirectory method. 

It has no effect.
This commit is contained in:
Stephen Kelly 2015-04-01 19:35:12 +02:00
parent 37897347b3
commit c3a60cc9cc
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmAuxSourceDirectoryCommand.cxx
View File

@ -26,7 +26,6 @@ bool cmAuxSourceDirectoryCommand::InitialPass
std::string sourceListValue; std::string sourceListValue;
std::string templateDirectory = args[0]; std::string templateDirectory = args[0];
this->Makefile->AddExtraDirectory(templateDirectory.c_str());
std::string tdir; std::string tdir;
if(!cmSystemTools::FileIsFullPath(templateDirectory.c_str())) if(!cmSystemTools::FileIsFullPath(templateDirectory.c_str()))
{ {

6
Source/cmMakefile.cxx
View File

@ -114,7 +114,6 @@ cmMakefile::cmMakefile(const cmMakefile& mf): Internal(new Internals)
this->Internal->VarUsageStack.push(mf.Internal->VarUsageStack.top()); this->Internal->VarUsageStack.push(mf.Internal->VarUsageStack.top());
this->Prefix = mf.Prefix; this->Prefix = mf.Prefix;
this->AuxSourceDirectories = mf.AuxSourceDirectories;
this->cmStartDirectory = mf.cmStartDirectory; this->cmStartDirectory = mf.cmStartDirectory;
this->StartOutputDirectory = mf.StartOutputDirectory; this->StartOutputDirectory = mf.StartOutputDirectory;
this->cmHomeDirectory = mf.cmHomeDirectory; this->cmHomeDirectory = mf.cmHomeDirectory;
@ -2256,11 +2255,6 @@ void cmMakefile::AddSourceGroup(const std::vector<std::string>& name,
#endif #endif
void cmMakefile::AddExtraDirectory(const char* dir)
{
this->AuxSourceDirectories.push_back(dir);
}
static bool mightExpandVariablesCMP0019(const char* s) static bool mightExpandVariablesCMP0019(const char* s)
{ {
return s && *s && strstr(s,"${") && strchr(s,'}'); return s && *s && strstr(s,"${") && strchr(s,'}');

6
Source/cmMakefile.h
View File

@ -433,11 +433,6 @@ public:
bool HasCMP0054AlreadyBeenReported( bool HasCMP0054AlreadyBeenReported(
cmListFileContext context) const; cmListFileContext context) const;
/**
* Add an auxiliary directory to the build.
*/
void AddExtraDirectory(const char* dir);
void MakeStartDirectoriesCurrent() void MakeStartDirectoriesCurrent()
{ {
this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR",
@ -967,7 +962,6 @@ protected:
void CheckForUnused(const char* reason, const std::string& name) const; void CheckForUnused(const char* reason, const std::string& name) const;
std::string Prefix; std::string Prefix;
std::vector<std::string> AuxSourceDirectories; //
std::string cmStartDirectory; std::string cmStartDirectory;
std::string StartOutputDirectory; std::string StartOutputDirectory;