mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-28 01:49:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Drop unnecessary working mode checks

Browse Source 
In `cmake::Run` we return before `Configure` or `Generate` when
not working in normal mode so they do not need mode checks.

While at it, remove a long-outdated comment about when to save the
cache.
This commit is contained in:
Brad King
2018-08-24 08:15:51 -04:00
parent bd7dd6d414
commit fb73edf70c
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmake.cxx
+6 -13
View File
@@ -1262,10 +1262,7 @@ int cmake::ActualConfigure()
this->UpdateConversionPathTable(); this->UpdateConversionPathTable();
this->CleanupCommandsAndMacros(); this->CleanupCommandsAndMacros();
int res = 0; int res = this->DoPreConfigureChecks();
if (this->GetWorkingMode() == NORMAL_MODE) {
res = this->DoPreConfigureChecks();
}
if (res < 0) { if (res < 0) {
return -2; return -2;
} }
@@ -1431,11 +1428,8 @@ int cmake::ActualConfigure()
"CMakeLists.txt ?"); "CMakeLists.txt ?");
} }
// only save the cache if there were no fatal errors this->State->SaveVerificationScript(this->GetHomeOutputDirectory());
if (this->GetWorkingMode() == NORMAL_MODE) { this->SaveCache(this->GetHomeOutputDirectory());
this->State->SaveVerificationScript(this->GetHomeOutputDirectory());
this->SaveCache(this->GetHomeOutputDirectory());
}
if (cmSystemTools::GetErrorOccuredFlag()) { if (cmSystemTools::GetErrorOccuredFlag()) {
return -1; return -1;
} }
@@ -1588,7 +1582,7 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
} }
int ret = this->Configure(); int ret = this->Configure();
if (ret || this->GetWorkingMode() != NORMAL_MODE) { if (ret) {
#if defined(CMAKE_HAVE_VS_GENERATORS) #if defined(CMAKE_HAVE_VS_GENERATORS)
if (!this->VSSolutionFile.empty() && this->GlobalGenerator) { if (!this->VSSolutionFile.empty() && this->GlobalGenerator) {
// CMake is running to regenerate a Visual Studio build tree // CMake is running to regenerate a Visual Studio build tree
@@ -1634,9 +1628,8 @@ int cmake::Generate()
// Save the cache again after a successful Generate so that any internal // Save the cache again after a successful Generate so that any internal
// variables created during Generate are saved. (Specifically target GUIDs // variables created during Generate are saved. (Specifically target GUIDs
// for the Visual Studio and Xcode generators.) // for the Visual Studio and Xcode generators.)
if (this->GetWorkingMode() == NORMAL_MODE) { this->SaveCache(this->GetHomeOutputDirectory());
this->SaveCache(this->GetHomeOutputDirectory());
}
return 0; return 0;
} }