summaryrefslogtreecommitdiffstats
path: root/Source/cmSearchPath.cxx
diff options
context:
space:
mode:
authorVitaly Stakhovsky <vvs31415@gitlab.org>2018-08-24 17:58:19 (GMT)
committerBrad King <brad.king@kitware.com>2018-08-27 18:07:43 (GMT)
commitc8fd23ec6f33eef8cf11d81938c379590080bd19 (patch)
tree75a04f4a2a037ededbee0a92628c103af03fc816 /Source/cmSearchPath.cxx
parent0897c3cf585853358ef7ec2bd180dbb2e3288b21 (diff)
downloadCMake-c8fd23ec6f33eef8cf11d81938c379590080bd19.zip
CMake-c8fd23ec6f33eef8cf11d81938c379590080bd19.tar.gz
CMake-c8fd23ec6f33eef8cf11d81938c379590080bd19.tar.bz2
cmMakefile: return directories as const std::string&
Diffstat (limited to 'Source/cmSearchPath.cxx')
-rw-r--r--Source/cmSearchPath.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/cmSearchPath.cxx b/Source/cmSearchPath.cxx
index 5b29868..5dd4413 100644
--- a/Source/cmSearchPath.cxx
+++ b/Source/cmSearchPath.cxx
@@ -69,7 +69,8 @@ void cmSearchPath::AddUserPath(const std::string& path)
// Process them all from the current directory
for (std::string const& p : outPaths) {
- this->AddPathInternal(p, this->FC->Makefile->GetCurrentSourceDirectory());
+ this->AddPathInternal(
+ p, this->FC->Makefile->GetCurrentSourceDirectory().c_str());
}
}
@@ -83,8 +84,8 @@ void cmSearchPath::AddCMakePath(const std::string& variable)
cmSystemTools::ExpandListArgument(value, expanded);
for (std::string const& p : expanded) {
- this->AddPathInternal(p,
- this->FC->Makefile->GetCurrentSourceDirectory());
+ this->AddPathInternal(
+ p, this->FC->Makefile->GetCurrentSourceDirectory().c_str());
}
}
}
@@ -107,8 +108,8 @@ void cmSearchPath::AddCMakePrefixPath(const std::string& variable)
std::vector<std::string> expanded;
cmSystemTools::ExpandListArgument(value, expanded);
- this->AddPrefixPaths(expanded,
- this->FC->Makefile->GetCurrentSourceDirectory());
+ this->AddPrefixPaths(
+ expanded, this->FC->Makefile->GetCurrentSourceDirectory().c_str());
}
}