summaryrefslogtreecommitdiff
path: root/Source/cmLocalVisualStudio10Generator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-04-08 10:40:57 -0400
committerBrad King <brad.king@kitware.com>2011-04-08 15:36:16 -0400
commit06fcbc4757c7a52733a554d4050735452d49a5e7 (patch)
treeec735575eb956a5a5ea873b87e0e43ea6c73168d /Source/cmLocalVisualStudio10Generator.h
parenta961ecdad0ec31bacb3f6abff83aa65f0b51a676 (diff)
downloadcmake-06fcbc4757c7a52733a554d4050735452d49a5e7.tar.gz
VS10: Fix working directory of consecutive custom commands (#11938)
The VS 10 msbuild tool uses a single command shell to invoke all the custom command scripts in a project. Isolate the environment and working directory of custom commands using setlocal/endlocal. The form of each command is set errlev= setlocal cd c:\work\dir if %errorlevel% neq 0 goto :cmEnd c: if %errorlevel% neq 0 goto :cmEnd command1 ... if %errorlevel% neq 0 goto :cmEnd ... commandN ... if %errorlevel% neq 0 goto :cmEnd :cmEnd endlocal & set errlev=%errorlevel% if %errlev% neq 0 goto :VCEnd so that all changes to the environment and working directory are isolated within the script and the return code is preserved.
Diffstat (limited to 'Source/cmLocalVisualStudio10Generator.h')
-rw-r--r--Source/cmLocalVisualStudio10Generator.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalVisualStudio10Generator.h b/Source/cmLocalVisualStudio10Generator.h
index 06b8b09392..2330432ea8 100644
--- a/Source/cmLocalVisualStudio10Generator.h
+++ b/Source/cmLocalVisualStudio10Generator.h
@@ -38,7 +38,7 @@ public:
const char* path);
protected:
- virtual std::string CheckForErrorLine();
+ virtual const char* ReportErrorLabel() const;
private:
};