diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-16 13:56:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-16 13:56:02 (GMT) |
| commit | 195ab50f635bb95035b5bf2fda7a3bf692a122f5 (patch) | |
| tree | 349c0baeeecffc8a4c5fee71a7c09cd13b84ef4c | |
| parent | 12bea47fa4d47b8e887ddbaf4c4fcc312d3052dc (diff) | |
| parent | 7789dd9a1ae79d6747883739a21cf90c139d1e54 (diff) | |
| download | CMake-195ab50f635bb95035b5bf2fda7a3bf692a122f5.zip CMake-195ab50f635bb95035b5bf2fda7a3bf692a122f5.tar.gz CMake-195ab50f635bb95035b5bf2fda7a3bf692a122f5.tar.bz2 | |
Merge branch 'mr-reset-error-flag-on-configure' into release
| -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 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."); } |