diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-09 21:27:19 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-09 21:27:19 (GMT) |
| commit | a0ed39ac2207edbda08b1459096d2c1bf757cc71 (patch) | |
| tree | 69aabd527b162fbc4148c9048b53735db3dfa5fb /Source/cmServerProtocol.cxx | |
| parent | 8f9e0884d4f948526c08c35dde345a142352d549 (diff) | |
| parent | 7789dd9a1ae79d6747883739a21cf90c139d1e54 (diff) | |
| download | CMake-a0ed39ac2207edbda08b1459096d2c1bf757cc71.zip CMake-a0ed39ac2207edbda08b1459096d2c1bf757cc71.tar.gz CMake-a0ed39ac2207edbda08b1459096d2c1bf757cc71.tar.bz2 | |
Merge topic 'mr-reset-error-flag-on-configure'
7789dd9a server-mode: Call ResetErrorOccured before configure
Diffstat (limited to 'Source/cmServerProtocol.cxx')
| -rw-r--r-- | Source/cmServerProtocol.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index f47cb33..a86236c 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -997,6 +997,8 @@ cmServerResponse cmServerProtocol1_0::ProcessConfigure( } } + cmSystemTools::ResetErrorOccuredFlag(); // Reset error state + if (cm->AddCMakePaths() != 1) { return request.ReportError("Failed to set CMake paths."); } |