diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-12 14:42:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-12 14:42:38 (GMT) |
| commit | cb8f87f6229359790956a6640639bbe6b8c346f7 (patch) | |
| tree | 3501cbf4a528b475b8da15b88e0b14879bddd4c2 /Source/cmAddSubDirectoryCommand.cxx | |
| parent | 9defc45f78d4fe10928fd0a94ffa97fc80f5da56 (diff) | |
| parent | 3be265b304da0879c79e2fcdfff6f25b1a4e87c1 (diff) | |
| download | CMake-cb8f87f6229359790956a6640639bbe6b8c346f7.zip CMake-cb8f87f6229359790956a6640639bbe6b8c346f7.tar.gz CMake-cb8f87f6229359790956a6640639bbe6b8c346f7.tar.bz2 | |
Merge topic 'remove-c_str-calls'
3be265b3 Workaround Sun C++ 5.9 compiler crash
af8a1643 Remove c_str calls when using stream APIs.
21c573f6 Remove some c_str() calls.
Diffstat (limited to 'Source/cmAddSubDirectoryCommand.cxx')
| -rw-r--r-- | Source/cmAddSubDirectoryCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmAddSubDirectoryCommand.cxx b/Source/cmAddSubDirectoryCommand.cxx index 5b1c9c6..4ea2524 100644 --- a/Source/cmAddSubDirectoryCommand.cxx +++ b/Source/cmAddSubDirectoryCommand.cxx @@ -66,7 +66,7 @@ bool cmAddSubDirectoryCommand::InitialPass std::string error = "given source \""; error += srcArg; error += "\" which is not an existing directory."; - this->SetError(error.c_str()); + this->SetError(error); return false; } srcPath = cmSystemTools::CollapseFullPath(srcPath.c_str()); @@ -87,7 +87,7 @@ bool cmAddSubDirectoryCommand::InitialPass << this->Makefile->GetCurrentDirectory() << "\". " << "When specifying an out-of-tree source a binary directory " << "must be explicitly specified."; - this->SetError(e.str().c_str()); + this->SetError(e.str()); return false; } @@ -121,7 +121,7 @@ bool cmAddSubDirectoryCommand::InitialPass binPath = cmSystemTools::CollapseFullPath(binPath.c_str()); // Add the subdirectory using the computed full paths. - this->Makefile->AddSubDirectory(srcPath.c_str(), binPath.c_str(), + this->Makefile->AddSubDirectory(srcPath, binPath, excludeFromAll, false, true); return true; |