diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-26 17:24:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-26 17:24:37 (GMT) |
| commit | f04e217cc12628559f084549f42fc1686ff769de (patch) | |
| tree | 2b7d6eb8eaace6f2a76829abfffd0944dc8a6792 /Source | |
| parent | 06c9f554495de7f56ba41d716fbc5cb27f7afcda (diff) | |
| parent | bccc056ba86ede84b9f0acb066de97103a74268a (diff) | |
| download | CMake-f04e217cc12628559f084549f42fc1686ff769de.zip CMake-f04e217cc12628559f084549f42fc1686ff769de.tar.gz CMake-f04e217cc12628559f084549f42fc1686ff769de.tar.bz2 | |
Merge topic 'remove-CMakeFiles-advice'
bccc056b cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmake.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index ede6842..2cf636c 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1413,8 +1413,8 @@ int cmake::ActualConfigure() message += "\nDoes not match the generator used previously: "; message += genName; message += - "\nEither remove the CMakeCache.txt file or choose a different" - " binary directory."; + "\nEither remove the CMakeCache.txt file and CMakeFiles " + "directory or choose a different binary directory."; cmSystemTools::Error(message.c_str()); return -2; } @@ -1445,8 +1445,8 @@ int cmake::ActualConfigure() message += "\nDoes not match the toolset used previously: "; message += tsName; message += - "\nEither remove the CMakeCache.txt file or choose a different" - " binary directory."; + "\nEither remove the CMakeCache.txt file and CMakeFiles " + "directory or choose a different binary directory."; cmSystemTools::Error(message.c_str()); return -2; } |