diff options
author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-02-24 22:38:30 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-03-08 18:05:38 (GMT) |
commit | 24b5e93de2c753e94cae3b41c1ca7cddaa03e5e7 (patch) | |
tree | 5ec6ae8e35601e8762007e248ab8f5e1da7b771c /Source/cmMakefile.cxx | |
parent | 11ed3e2cfe70e7d9d5a8e1f8e24fa61bbf6420b0 (diff) | |
download | CMake-24b5e93de2c753e94cae3b41c1ca7cddaa03e5e7.zip CMake-24b5e93de2c753e94cae3b41c1ca7cddaa03e5e7.tar.gz CMake-24b5e93de2c753e94cae3b41c1ca7cddaa03e5e7.tar.bz2 |
stringapi: Use strings for directories
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index bb88bc4..e61b12b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3060,7 +3060,8 @@ void cmMakefile::ExpandSourceListArguments( } } -int cmMakefile::TryCompile(const char *srcdir, const char *bindir, +int cmMakefile::TryCompile(const std::string& srcdir, + const std::string& bindir, const std::string& projectName, const std::string& targetName, bool fast, @@ -3069,15 +3070,15 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir, { this->Internal->IsSourceFileTryCompile = fast; // does the binary directory exist ? If not create it... - if (!cmSystemTools::FileIsDirectory(bindir)) + if (!cmSystemTools::FileIsDirectory(bindir.c_str())) { - cmSystemTools::MakeDirectory(bindir); + cmSystemTools::MakeDirectory(bindir.c_str()); } // change to the tests directory and run cmake // use the cmake object instead of calling cmake std::string cwd = cmSystemTools::GetCurrentWorkingDirectory(); - cmSystemTools::ChangeDirectory(bindir); + cmSystemTools::ChangeDirectory(bindir.c_str()); // make sure the same generator is used // use this program as the cmake to be run, it should not |