kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'remove-CMakeFiles-advice' 

bccc056b cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820)
This commit is contained in:
Brad King 2014-03-26 13:24:37 -04:00 committed by CMake Topic Stage
parent 06c9f55449 bccc056ba8
commit f04e217cc1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmake.cxx
View File

@ -1413,8 +1413,8 @@ int cmake::ActualConfigure()
message += "\nDoes not match the generator used previously: "; message += "\nDoes not match the generator used previously: ";
message += genName; message += genName;
message += message +=
"\nEither remove the CMakeCache.txt file or choose a different" "\nEither remove the CMakeCache.txt file and CMakeFiles "
" binary directory."; "directory or choose a different binary directory.";
cmSystemTools::Error(message.c_str()); cmSystemTools::Error(message.c_str());
return -2; return -2;
} }
@ -1445,8 +1445,8 @@ int cmake::ActualConfigure()
message += "\nDoes not match the toolset used previously: "; message += "\nDoes not match the toolset used previously: ";
message += tsName; message += tsName;
message += message +=
"\nEither remove the CMakeCache.txt file or choose a different" "\nEither remove the CMakeCache.txt file and CMakeFiles "
" binary directory."; "directory or choose a different binary directory.";
cmSystemTools::Error(message.c_str()); cmSystemTools::Error(message.c_str());
return -2; return -2;
} }