|
|
@@ -143,7 +143,7 @@ static std::string cmakemainGetStack(cmake* cm)
|
|
|
}
|
|
|
|
|
|
static void cmakemainMessageCallback(const char* m, const char* /*unused*/,
|
|
|
- bool& /*unused*/, cmake* cm)
|
|
|
+ cmake* cm)
|
|
|
{
|
|
|
std::cerr << m << cmakemainGetStack(cm) << std::endl << std::flush;
|
|
|
}
|
|
|
@@ -319,10 +319,9 @@ int do_cmake(int ac, char const* const* av)
|
|
|
cmake cm(role, mode);
|
|
|
cm.SetHomeDirectory("");
|
|
|
cm.SetHomeOutputDirectory("");
|
|
|
- cmSystemTools::SetMessageCallback(
|
|
|
- [&cm](const char* msg, const char* title, bool& cancel) {
|
|
|
- cmakemainMessageCallback(msg, title, cancel, &cm);
|
|
|
- });
|
|
|
+ cmSystemTools::SetMessageCallback([&cm](const char* msg, const char* title) {
|
|
|
+ cmakemainMessageCallback(msg, title, &cm);
|
|
|
+ });
|
|
|
cm.SetProgressCallback([&cm](const char* msg, float prog) {
|
|
|
cmakemainProgressCallback(msg, prog, &cm);
|
|
|
});
|
|
|
@@ -500,10 +499,9 @@ static int do_build(int ac, char const* const* av)
|
|
|
}
|
|
|
|
|
|
cmake cm(cmake::RoleInternal, cmState::Unknown);
|
|
|
- cmSystemTools::SetMessageCallback(
|
|
|
- [&cm](const char* msg, const char* title, bool& cancel) {
|
|
|
- cmakemainMessageCallback(msg, title, cancel, &cm);
|
|
|
- });
|
|
|
+ cmSystemTools::SetMessageCallback([&cm](const char* msg, const char* title) {
|
|
|
+ cmakemainMessageCallback(msg, title, &cm);
|
|
|
+ });
|
|
|
cm.SetProgressCallback([&cm](const char* msg, float prog) {
|
|
|
cmakemainProgressCallback(msg, prog, &cm);
|
|
|
});
|
|
|
@@ -543,10 +541,9 @@ static int do_open(int ac, char const* const* av)
|
|
|
}
|
|
|
|
|
|
cmake cm(cmake::RoleInternal, cmState::Unknown);
|
|
|
- cmSystemTools::SetMessageCallback(
|
|
|
- [&cm](const char* msg, const char* title, bool& cancel) {
|
|
|
- cmakemainMessageCallback(msg, title, cancel, &cm);
|
|
|
- });
|
|
|
+ cmSystemTools::SetMessageCallback([&cm](const char* msg, const char* title) {
|
|
|
+ cmakemainMessageCallback(msg, title, &cm);
|
|
|
+ });
|
|
|
cm.SetProgressCallback([&cm](const char* msg, float prog) {
|
|
|
cmakemainProgressCallback(msg, prog, &cm);
|
|
|
});
|