[Cmake-commits] CMake branch, master, updated. v3.12.1-450-g7b148e7

[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  7b148e7a3037a7a7d852244e391a7350d8e75d64 (commit)
       via  6a8b65c04237ff2dfe004dc1ce29b725666f2758 (commit)
       via  5029d58c3862811184d4a75891b3474b2a9512e1 (commit)
       via  6f3b9e8b9506b4631b70cf506152defa8f9e54e0 (commit)
      from  e33c6c357b61ed0cc5b9f7c01e4ea04deca26b39 (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=7b148e7a3037a7a7d852244e391a7350d8e75d64
commit 7b148e7a3037a7a7d852244e391a7350d8e75d64
Merge: 6a8b65c 6f3b9e8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 24 17:24:59 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 24 13:34:06 2018 -0400

    Merge topic 'state-reset-glob'
    
    6f3b9e8b95 cmState: Clear GlobVerificationManager state on Reset
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2278


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a8b65c04237ff2dfe004dc1ce29b725666f2758
commit 6a8b65c04237ff2dfe004dc1ce29b725666f2758
Merge: e33c6c3 5029d58
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 24 17:24:10 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 24 13:32:13 2018 -0400

    Merge topic 'ctest-submit-httpauth'
    
    5029d58c38 ctest: allow cdash submissions using alternate authentication methods
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2288


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5029d58c3862811184d4a75891b3474b2a9512e1
commit 5029d58c3862811184d4a75891b3474b2a9512e1
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Aug 13 14:06:00 2018 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Aug 17 09:18:07 2018 -0600

    ctest: allow cdash submissions using alternate authentication methods

diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index 4c2b75e..cbed40e 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -454,6 +454,10 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
       // specify target
       ::curl_easy_setopt(curl, CURLOPT_URL, upload_as.c_str());
 
+      // CURLAUTH_BASIC is default, and here we allow additional methods,
+      // including more secure ones
+      ::curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+
       // now specify which file to upload
       ::curl_easy_setopt(curl, CURLOPT_INFILE, ftpfile);
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f3b9e8b9506b4631b70cf506152defa8f9e54e0
commit 6f3b9e8b9506b4631b70cf506152defa8f9e54e0
Author:     Shane Parris <shane.lee.parris at gmail.com>
AuthorDate: Thu Aug 9 12:51:29 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 9 13:03:50 2018 -0400

    cmState: Clear GlobVerificationManager state on Reset
    
    It should not persist across multiple configure rounds.
    
    Fixes: #18208

diff --git a/Source/cmGlobVerificationManager.cxx b/Source/cmGlobVerificationManager.cxx
index e23b6ea..189b517 100644
--- a/Source/cmGlobVerificationManager.cxx
+++ b/Source/cmGlobVerificationManager.cxx
@@ -170,3 +170,10 @@ void cmGlobVerificationManager::AddCacheEntry(
     value.Backtraces.emplace_back(variable, backtrace);
   }
 }
+
+void cmGlobVerificationManager::Reset()
+{
+  this->Cache.clear();
+  this->VerifyScript.clear();
+  this->VerifyStamp.clear();
+}
diff --git a/Source/cmGlobVerificationManager.h b/Source/cmGlobVerificationManager.h
index 4508602..cf04c97 100644
--- a/Source/cmGlobVerificationManager.h
+++ b/Source/cmGlobVerificationManager.h
@@ -37,6 +37,9 @@ protected:
                      const std::string& variable,
                      const cmListFileBacktrace& bt);
 
+  ///! Clear the glob cache for state reset.
+  void Reset();
+
   ///! Check targets should be written in generated build system.
   bool DoWriteVerifyTarget() const;
 
diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index a57be4d..b2f6091 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -267,6 +267,7 @@ cmStateSnapshot cmState::Reset()
 {
   this->GlobalProperties.clear();
   this->PropertyDefinitions.clear();
+  this->GlobVerificationManager->Reset();
 
   cmStateDetail::PositionType pos = this->SnapshotData.Truncate();
   this->ExecutionListFiles.Truncate();

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

Summary of changes:
 Source/CTest/cmCTestSubmitHandler.cxx | 4 ++++
 Source/cmGlobVerificationManager.cxx  | 7 +++++++
 Source/cmGlobVerificationManager.h    | 3 +++
 Source/cmState.cxx                    | 1 +
 4 files changed, 15 insertions(+)


hooks/post-receive
-- 
CMake