[Cmake-commits] CMake branch, master, updated. v3.12.1-516-g5563d6b

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  5563d6b3a64f6c9a83c1ab928e2283c84cb4af41 (commit)
       via  fb73edf70cc1aea44eac27c8827e616c650bbe7d (commit)
       via  bd7dd6d414303e8fc4da786107f4292768d87638 (commit)
      from  b11e021bed6d406e3a7b9af6f5ef8fa5565881af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5563d6b3a64f6c9a83c1ab928e2283c84cb4af41
commit 5563d6b3a64f6c9a83c1ab928e2283c84cb4af41
Merge: b11e021 fb73edf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 30 13:25:46 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Aug 30 09:25:51 2018 -0400

    Merge topic 'minor-cleanup'
    
    fb73edf70c cmake: Drop unnecessary working mode checks
    bd7dd6d414 cmake: Declare VariableWatch member only when used
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2326


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb73edf70cc1aea44eac27c8827e616c650bbe7d
commit fb73edf70cc1aea44eac27c8827e616c650bbe7d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 24 08:15:51 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 29 09:38:32 2018 -0400

    cmake: Drop unnecessary working mode checks
    
    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.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 5bb1f22..1bf8f7d 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1262,10 +1262,7 @@ int cmake::ActualConfigure()
   this->UpdateConversionPathTable();
   this->CleanupCommandsAndMacros();
 
-  int res = 0;
-  if (this->GetWorkingMode() == NORMAL_MODE) {
-    res = this->DoPreConfigureChecks();
-  }
+  int res = this->DoPreConfigureChecks();
   if (res < 0) {
     return -2;
   }
@@ -1431,11 +1428,8 @@ int cmake::ActualConfigure()
       "CMakeLists.txt ?");
   }
 
-  // only save the cache if there were no fatal errors
-  if (this->GetWorkingMode() == NORMAL_MODE) {
-    this->State->SaveVerificationScript(this->GetHomeOutputDirectory());
-    this->SaveCache(this->GetHomeOutputDirectory());
-  }
+  this->State->SaveVerificationScript(this->GetHomeOutputDirectory());
+  this->SaveCache(this->GetHomeOutputDirectory());
   if (cmSystemTools::GetErrorOccuredFlag()) {
     return -1;
   }
@@ -1588,7 +1582,7 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
   }
 
   int ret = this->Configure();
-  if (ret || this->GetWorkingMode() != NORMAL_MODE) {
+  if (ret) {
 #if defined(CMAKE_HAVE_VS_GENERATORS)
     if (!this->VSSolutionFile.empty() && this->GlobalGenerator) {
       // 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
   // variables created during Generate are saved. (Specifically target GUIDs
   // for the Visual Studio and Xcode generators.)
-  if (this->GetWorkingMode() == NORMAL_MODE) {
-    this->SaveCache(this->GetHomeOutputDirectory());
-  }
+  this->SaveCache(this->GetHomeOutputDirectory());
+
   return 0;
 }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd7dd6d414303e8fc4da786107f4292768d87638
commit bd7dd6d414303e8fc4da786107f4292768d87638
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 24 07:31:01 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 29 09:38:32 2018 -0400

    cmake: Declare VariableWatch member only when used

diff --git a/Source/cmake.h b/Source/cmake.h
index 86e06df..4b4c67c 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -297,8 +297,10 @@ public:
   ///! this is called by generators to update the progress
   void UpdateProgress(const char* msg, float prog);
 
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   ///! Get the variable watch object
   cmVariableWatch* GetVariableWatch() { return this->VariableWatch; }
+#endif
 
   void GetGeneratorDocumentation(std::vector<cmDocumentationEntry>&);
 
@@ -493,8 +495,6 @@ protected:
 
   void GenerateGraphViz(const char* fileName) const;
 
-  cmVariableWatch* VariableWatch;
-
 private:
   ProgressCallbackType ProgressCallback;
   void* ProgressCallbackClientData;
@@ -525,6 +525,10 @@ private:
   std::string GraphVizFile;
   InstalledFilesMap InstalledFiles;
 
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+  cmVariableWatch* VariableWatch;
+#endif
+
   cmState* State;
   cmStateSnapshot CurrentSnapshot;
   cmMessenger* Messenger;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmake.cxx | 19 ++++++-------------
 Source/cmake.h   |  8 ++++++--
 2 files changed, 12 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake