|
@@ -2369,11 +2369,11 @@ int cmake::ActualConfigure()
|
|
|
cmValue genName = this->State->GetInitializedCacheValue("CMAKE_GENERATOR");
|
|
cmValue genName = this->State->GetInitializedCacheValue("CMAKE_GENERATOR");
|
|
|
if (genName) {
|
|
if (genName) {
|
|
|
if (!this->GlobalGenerator->MatchesGeneratorName(*genName)) {
|
|
if (!this->GlobalGenerator->MatchesGeneratorName(*genName)) {
|
|
|
- std::string message =
|
|
|
|
|
- cmStrCat("Error: generator : ", this->GlobalGenerator->GetName(),
|
|
|
|
|
- "\nDoes not match the generator used previously: ", *genName,
|
|
|
|
|
- "\nEither remove the CMakeCache.txt file and CMakeFiles "
|
|
|
|
|
- "directory or choose a different binary directory.");
|
|
|
|
|
|
|
+ std::string message = cmStrCat(
|
|
|
|
|
+ "Error: generator : ", this->GlobalGenerator->GetName(), '\n',
|
|
|
|
|
+ "Does not match the generator used previously: ", *genName, '\n',
|
|
|
|
|
+ "Either remove the CMakeCache.txt file and CMakeFiles "
|
|
|
|
|
+ "directory or choose a different binary directory.");
|
|
|
cmSystemTools::Error(message);
|
|
cmSystemTools::Error(message);
|
|
|
return -2;
|
|
return -2;
|
|
|
}
|
|
}
|
|
@@ -2399,11 +2399,11 @@ int cmake::ActualConfigure()
|
|
|
if (cmValue instance =
|
|
if (cmValue instance =
|
|
|
this->State->GetInitializedCacheValue("CMAKE_GENERATOR_INSTANCE")) {
|
|
this->State->GetInitializedCacheValue("CMAKE_GENERATOR_INSTANCE")) {
|
|
|
if (this->GeneratorInstanceSet && this->GeneratorInstance != *instance) {
|
|
if (this->GeneratorInstanceSet && this->GeneratorInstance != *instance) {
|
|
|
- std::string message =
|
|
|
|
|
- cmStrCat("Error: generator instance: ", this->GeneratorInstance,
|
|
|
|
|
- "\nDoes not match the instance used previously: ", *instance,
|
|
|
|
|
- "\nEither remove the CMakeCache.txt file and CMakeFiles "
|
|
|
|
|
- "directory or choose a different binary directory.");
|
|
|
|
|
|
|
+ std::string message = cmStrCat(
|
|
|
|
|
+ "Error: generator instance: ", this->GeneratorInstance, '\n',
|
|
|
|
|
+ "Does not match the instance used previously: ", *instance, '\n',
|
|
|
|
|
+ "Either remove the CMakeCache.txt file and CMakeFiles "
|
|
|
|
|
+ "directory or choose a different binary directory.");
|
|
|
cmSystemTools::Error(message);
|
|
cmSystemTools::Error(message);
|
|
|
return -2;
|
|
return -2;
|
|
|
}
|
|
}
|
|
@@ -2418,9 +2418,9 @@ int cmake::ActualConfigure()
|
|
|
if (this->GeneratorPlatformSet &&
|
|
if (this->GeneratorPlatformSet &&
|
|
|
this->GeneratorPlatform != *platformName) {
|
|
this->GeneratorPlatform != *platformName) {
|
|
|
std::string message = cmStrCat(
|
|
std::string message = cmStrCat(
|
|
|
- "Error: generator platform: ", this->GeneratorPlatform,
|
|
|
|
|
- "\nDoes not match the platform used previously: ", *platformName,
|
|
|
|
|
- "\nEither remove the CMakeCache.txt file and CMakeFiles "
|
|
|
|
|
|
|
+ "Error: generator platform: ", this->GeneratorPlatform, '\n',
|
|
|
|
|
+ "Does not match the platform used previously: ", *platformName, '\n',
|
|
|
|
|
+ "Either remove the CMakeCache.txt file and CMakeFiles "
|
|
|
"directory or choose a different binary directory.");
|
|
"directory or choose a different binary directory.");
|
|
|
cmSystemTools::Error(message);
|
|
cmSystemTools::Error(message);
|
|
|
return -2;
|
|
return -2;
|
|
@@ -2434,9 +2434,9 @@ int cmake::ActualConfigure()
|
|
|
this->State->GetInitializedCacheValue("CMAKE_GENERATOR_TOOLSET")) {
|
|
this->State->GetInitializedCacheValue("CMAKE_GENERATOR_TOOLSET")) {
|
|
|
if (this->GeneratorToolsetSet && this->GeneratorToolset != *tsName) {
|
|
if (this->GeneratorToolsetSet && this->GeneratorToolset != *tsName) {
|
|
|
std::string message =
|
|
std::string message =
|
|
|
- cmStrCat("Error: generator toolset: ", this->GeneratorToolset,
|
|
|
|
|
- "\nDoes not match the toolset used previously: ", *tsName,
|
|
|
|
|
- "\nEither remove the CMakeCache.txt file and CMakeFiles "
|
|
|
|
|
|
|
+ cmStrCat("Error: generator toolset: ", this->GeneratorToolset, '\n',
|
|
|
|
|
+ "Does not match the toolset used previously: ", *tsName, '\n',
|
|
|
|
|
+ "Either remove the CMakeCache.txt file and CMakeFiles "
|
|
|
"directory or choose a different binary directory.");
|
|
"directory or choose a different binary directory.");
|
|
|
cmSystemTools::Error(message);
|
|
cmSystemTools::Error(message);
|
|
|
return -2;
|
|
return -2;
|