summaryrefslogtreecommitdiff
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2014-02-24 17:38:30 -0500
committerBrad King <brad.king@kitware.com>2014-03-08 13:05:38 -0500
commit24b5e93de2c753e94cae3b41c1ca7cddaa03e5e7 (patch)
tree5ec6ae8e35601e8762007e248ab8f5e1da7b771c /Source/cmGlobalGenerator.cxx
parent11ed3e2cfe70e7d9d5a8e1f8e24fa61bbf6420b0 (diff)
downloadcmake-24b5e93de2c753e94cae3b41c1ca7cddaa03e5e7.tar.gz
stringapi: Use strings for directories
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a14696d256..c1cce2ed6e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1614,7 +1614,8 @@ void cmGlobalGenerator::CheckLocalGenerators()
}
}
-int cmGlobalGenerator::TryCompile(const char *srcdir, const char *bindir,
+int cmGlobalGenerator::TryCompile(const std::string& srcdir,
+ const std::string& bindir,
const std::string& projectName,
const std::string& target, bool fast,
std::string *output, cmMakefile *mf)
@@ -1665,7 +1666,7 @@ int cmGlobalGenerator::TryCompile(const char *srcdir, const char *bindir,
void cmGlobalGenerator::GenerateBuildCommand(
std::vector<std::string>& makeCommand, const char*, const std::string&,
- const char*, const std::string&, const std::string&, bool,
+ const std::string&, const std::string&, const std::string&, bool,
std::vector<std::string> const&)
{
makeCommand.push_back(
@@ -1673,7 +1674,7 @@ void cmGlobalGenerator::GenerateBuildCommand(
}
int cmGlobalGenerator::Build(
- const char *, const char *bindir,
+ const std::string&, const std::string& bindir,
const std::string& projectName, const std::string& target,
std::string *output,
const char *makeCommandCSTR,
@@ -1687,7 +1688,7 @@ int cmGlobalGenerator::Build(
* Run an executable command and put the stdout in output.
*/
std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
- cmSystemTools::ChangeDirectory(bindir);
+ cmSystemTools::ChangeDirectory(bindir.c_str());
if(output)
{
*output += "Change Dir: ";