diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-01-23 15:12:17 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-01-23 15:19:30 (GMT) |
| commit | 99337d345ba9d3379135c90854be23403fa8e274 (patch) | |
| tree | c7ccda407d2c3627561574f5ea3c6fe5353e31e5 /Source/cmake.cxx | |
| parent | a7f5cd45e135dd51d67176fc40e2d769ac5f7db8 (diff) | |
| download | CMake-99337d345ba9d3379135c90854be23403fa8e274.zip CMake-99337d345ba9d3379135c90854be23403fa8e274.tar.gz CMake-99337d345ba9d3379135c90854be23403fa8e274.tar.bz2 | |
cmSystemTools::Error(): new overload accepting std::string
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 914c3b0..1261fff 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1172,7 +1172,7 @@ int cmake::DoPreConfigureChecks() } err << "Specify --help for usage, or press the help button on the CMake " "GUI."; - cmSystemTools::Error(err.str().c_str()); + cmSystemTools::Error(err.str()); return -2; } @@ -1190,7 +1190,7 @@ int cmake::DoPreConfigureChecks() message += cacheStart; message += "\" used to generate cache. "; message += "Re-run cmake with a different source directory."; - cmSystemTools::Error(message.c_str()); + cmSystemTools::Error(message); return -2; } } else { @@ -1400,7 +1400,7 @@ int cmake::ActualConfigure() message += *genName; message += "\nEither remove the CMakeCache.txt file and CMakeFiles " "directory or choose a different binary directory."; - cmSystemTools::Error(message.c_str()); + cmSystemTools::Error(message); return -2; } } @@ -1424,7 +1424,7 @@ int cmake::ActualConfigure() message += *instance; message += "\nEither remove the CMakeCache.txt file and CMakeFiles " "directory or choose a different binary directory."; - cmSystemTools::Error(message.c_str()); + cmSystemTools::Error(message); return -2; } } else { @@ -1443,7 +1443,7 @@ int cmake::ActualConfigure() message += *platformName; message += "\nEither remove the CMakeCache.txt file and CMakeFiles " "directory or choose a different binary directory."; - cmSystemTools::Error(message.c_str()); + cmSystemTools::Error(message); return -2; } } else { @@ -1461,7 +1461,7 @@ int cmake::ActualConfigure() message += *tsName; message += "\nEither remove the CMakeCache.txt file and CMakeFiles " "directory or choose a different binary directory."; - cmSystemTools::Error(message.c_str()); + cmSystemTools::Error(message); return -2; } } else { |