[Cmake-commits] CMake branch, master, updated. af92e723622a82eeec256b28420bf8c8a31a762b

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Mar 11 17:04:25 EST 2010


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  af92e723622a82eeec256b28420bf8c8a31a762b (commit)
      from  01f022c49c4c8daa830ad7d8fa44fa8c702bcf87 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af92e723622a82eeec256b28420bf8c8a31a762b
commit af92e723622a82eeec256b28420bf8c8a31a762b
Author: David Cole <david.cole at kitware.com>
Date:   Thu Mar 11 16:54:57 2010 -0500

    Add errorlevel checking after each custom command in a sequence.
    
    This makes the behavior of the build with the Visual Studio generators
    equivalent to the behavior of makefile based builds. After an error
    in a custom command sequence, the build stops and reports an error
    rather than executing the remaining commands in the sequence.

diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx
index 83d8dec..f3ed5b6 100644
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@@ -230,7 +230,15 @@ cmLocalVisualStudioGenerator
                                        escapeAllowMakeVars);
         }
       }
+
+    // After each custom command, check for an error result.
+    // If there was an error, jump to the VCReportError label,
+    // skipping the run of any subsequent commands in this
+    // sequence.
+    //
+    script += newline_text;
+    script += "if errorlevel 1 goto VCReportError";
     }
+
   return script;
 }
-

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

Summary of changes:
 Source/cmLocalVisualStudioGenerator.cxx |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list