summaryrefslogtreecommitdiff
path: root/Source/cmSearchPath.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-04-16 21:17:41 +0200
committerStephen Kelly <steveire@gmail.com>2015-04-21 00:12:52 +0200
commit55d80d0a8557189400bc12c5e577702a4d03b2e6 (patch)
treef19e6c57f469cc0ded33f382b0bee47369265c13 /Source/cmSearchPath.cxx
parentb23cf06f861e928cf8ee942eabd24ea76e299f4f (diff)
downloadcmake-55d80d0a8557189400bc12c5e577702a4d03b2e6.tar.gz
cmMakefile: Rename GetCurrent{,Source}Directory.
Match the names used in cmake code.
Diffstat (limited to 'Source/cmSearchPath.cxx')
-rw-r--r--Source/cmSearchPath.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx
index 045c82e5fe..c9cc81737a 100644
--- a/Source/cmSearchPath.cxx
+++ b/Source/cmSearchPath.cxx
@@ -86,7 +86,7 @@ void cmSearchPath::AddUserPath(const std::string& path)
for(std::vector<std::string>::const_iterator p = outPaths.begin();
p != outPaths.end(); ++p)
{
- this->AddPathInternal(*p, this->FC->Makefile->GetCurrentDirectory());
+ this->AddPathInternal(*p, this->FC->Makefile->GetCurrentSourceDirectory());
}
}
@@ -104,7 +104,8 @@ void cmSearchPath::AddCMakePath(const std::string& variable)
for(std::vector<std::string>::const_iterator p = expanded.begin();
p!= expanded.end(); ++p)
{
- this->AddPathInternal(*p, this->FC->Makefile->GetCurrentDirectory());
+ this->AddPathInternal(*p,
+ this->FC->Makefile->GetCurrentSourceDirectory());
}
}
}
@@ -132,7 +133,8 @@ void cmSearchPath::AddCMakePrefixPath(const std::string& variable)
std::vector<std::string> expanded;
cmSystemTools::ExpandListArgument(value, expanded);
- this->AddPrefixPaths(expanded, this->FC->Makefile->GetCurrentDirectory());
+ this->AddPrefixPaths(expanded,
+ this->FC->Makefile->GetCurrentSourceDirectory());
}
}