diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-19 13:43:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-04-19 13:44:02 (GMT) |
| commit | a2372f64b449be23353dec9678a63053682a4169 (patch) | |
| tree | d38b04d5fb5e563b6a17b3574c6966545dd89937 | |
| parent | afba2709f7dd89f1eb5af078ebdee40acf405a62 (diff) | |
| parent | 370bebd9210841cfb56d8b15d685e4ab9dc8c329 (diff) | |
| download | CMake-a2372f64b449be23353dec9678a63053682a4169.zip CMake-a2372f64b449be23353dec9678a63053682a4169.tar.gz CMake-a2372f64b449be23353dec9678a63053682a4169.tar.bz2 | |
Merge topic 'mrjoel/add-missing-not' into release-3.20
370bebd921 Add missing 'not' in error messages
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6012
| -rw-r--r-- | Source/cmake.cxx | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 4b57395..4d03821 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -3210,8 +3210,8 @@ int cmake::Build(int jobs, std::string dir, std::vector<std::string> targets, } auto gen = this->CreateGlobalGenerator(*cachedGenerator); if (!gen) { - std::cerr << "Error: could create CMAKE_GENERATOR \"" << *cachedGenerator - << "\"\n"; + std::cerr << "Error: could not create CMAKE_GENERATOR \"" + << *cachedGenerator << "\"\n"; return 1; } this->SetGlobalGenerator(std::move(gen)); @@ -3350,7 +3350,7 @@ bool cmake::Open(const std::string& dir, bool dryRun) std::unique_ptr<cmGlobalGenerator> gen = this->CreateGlobalGenerator(fullName); if (!gen) { - std::cerr << "Error: could create CMAKE_GENERATOR \"" << fullName + std::cerr << "Error: could not create CMAKE_GENERATOR \"" << fullName << "\"\n"; return false; } diff --git a/Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt b/Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt index 1103407..9390d77 100644 --- a/Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt +++ b/Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt @@ -1 +1 @@ -^Error: could create CMAKE_GENERATOR "Bad Generator"$ +^Error: could not create CMAKE_GENERATOR "Bad Generator"$ |