mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 22:59:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

stringapi: Use strings for directories

Browse Source
This commit is contained in:
Ben Boeckel
2014-02-24 17:38:30 -05:00
committed by Brad King
parent 11ed3e2cfe
commit 24b5e93de2
19 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMakefile.cxx
+5 -4
View File
@@ -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