[Cmake-commits] CMake branch, next, updated. v3.7.1-1800-g5d2b217

[Brad King]

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, next has been updated
       via  5d2b217e602966c0dc25ee70181bb47c97f6ed08 (commit)
       via  7789dd9a1ae79d6747883739a21cf90c139d1e54 (commit)
      from  eb64b2e2b41fe619e643045056a24bd6d6b81b87 (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=5d2b217e602966c0dc25ee70181bb47c97f6ed08
commit 5d2b217e602966c0dc25ee70181bb47c97f6ed08
Merge: eb64b2e 7789dd9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 16 08:58:03 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 16 08:58:03 2016 -0500

    Merge topic 'mr-reset-error-flag-on-configure' into next
    
    7789dd9a server-mode: Call ResetErrorOccured before configure


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7789dd9a1ae79d6747883739a21cf90c139d1e54
commit 7789dd9a1ae79d6747883739a21cf90c139d1e54
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Fri Dec 16 09:24:39 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 16 08:54:37 2016 -0500

    server-mode: Call ResetErrorOccured before configure
    
    Closes: #16506

diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index e159c8f..7815491 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -984,6 +984,8 @@ cmServerResponse cmServerProtocol1_0::ProcessConfigure(
     }
   }
 
+  cmSystemTools::ResetErrorOccuredFlag(); // Reset error state
+
   if (cm->AddCMakePaths() != 1) {
     return request.ReportError("Failed to set CMake paths.");
   }

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

Summary of changes:
 Source/cmServerProtocol.cxx |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake