summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudioGenerator.h
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2010-12-17 16:11:55 (GMT)
committerDavid Cole <david.cole@kitware.com>2010-12-17 16:11:55 (GMT)
commit66e79175327249aa2f0c80f5bd4a360b5b628bff (patch)
treecdeb74d2df2d8a3833921471b9ff9b4b1d962582 /Source/cmLocalVisualStudioGenerator.h
parentd11c70295b072d19c90c3e5d415d27de10253615 (diff)
downloadCMake-66e79175327249aa2f0c80f5bd4a360b5b628bff.zip
CMake-66e79175327249aa2f0c80f5bd4a360b5b628bff.tar.gz
CMake-66e79175327249aa2f0c80f5bd4a360b5b628bff.tar.bz2
VS10: stop build on custom command error (#11533)
In VS9 and previous versions, :VCReportError is the goto label to jump to after a failed custom command. It stops the build before it tries to go any further. In VS10, :VCEnd is the correct label to use. Create a method in the VS generators to provide the correct line of script to use for each version of Visual Studio. For more internal details, search for VCEnd in the C:\Program Files\MSBuild directory.
Diffstat (limited to 'Source/cmLocalVisualStudioGenerator.h')
-rw-r--r--Source/cmLocalVisualStudioGenerator.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index 6034b22..0019bfb 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -30,6 +30,7 @@ class cmLocalVisualStudioGenerator : public cmLocalGenerator
public:
cmLocalVisualStudioGenerator();
virtual ~cmLocalVisualStudioGenerator();
+
/** Construct a script from the given list of command lines. */
std::string ConstructScript(const cmCustomCommandLines& commandLines,
const char* workingDirectory,
@@ -38,7 +39,13 @@ public:
bool escapeAllowMakeVars,
const char* newline = "\n");
+ /** Line of batch file text that skips to the end after
+ * a failed step in a sequence of custom commands.
+ */
+ std::string GetCheckForErrorLine();
+
protected:
+ virtual std::string CheckForErrorLine();
/** Construct a custom command to make exe import lib dir. */
cmsys::auto_ptr<cmCustomCommand>