diff options
author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-09-23 13:07:41 (GMT) |
---|---|---|
committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-09-23 13:07:41 (GMT) |
commit | 38baabc66558908af2148a6c044f02bb01edb9f1 (patch) | |
tree | 8c6609445cda264860b40ed51edd04f8314eaf73 /Source/cmGlobalVisualStudio6Generator.cxx | |
parent | 7ee50e7ee5f5ebef9bf3ae6a32f699e183061438 (diff) | |
download | CMake-38baabc66558908af2148a6c044f02bb01edb9f1.zip CMake-38baabc66558908af2148a6c044f02bb01edb9f1.tar.gz CMake-38baabc66558908af2148a6c044f02bb01edb9f1.tar.bz2 |
Attempt to fix Visual studio 6 comiling
Diffstat (limited to 'Source/cmGlobalVisualStudio6Generator.cxx')
-rw-r--r-- | Source/cmGlobalVisualStudio6Generator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx index dba4272..9e0a676 100644 --- a/Source/cmGlobalVisualStudio6Generator.cxx +++ b/Source/cmGlobalVisualStudio6Generator.cxx @@ -42,7 +42,8 @@ void cmGlobalVisualStudio6Generator::EnableLanguage(const char*, int cmGlobalVisualStudio6Generator::TryCompile(const char *, const char *bindir, const char *projectName, - const char *targetName) + const char *targetName, + std::string *output) { // now build the test std::string makeCommand = @@ -60,8 +61,6 @@ int cmGlobalVisualStudio6Generator::TryCompile(const char *, /** * Run an executable command and put the stdout in output. */ - std::string output; - std::string cwd = cmSystemTools::GetCurrentWorkingDirectory(); cmSystemTools::ChangeDirectory(bindir); @@ -88,7 +87,7 @@ int cmGlobalVisualStudio6Generator::TryCompile(const char *, makeCommand += " - Debug\""; int retVal; - if (!cmSystemTools::RunCommand(makeCommand.c_str(), output, retVal)) + if (!cmSystemTools::RunCommand(makeCommand.c_str(), *output, retVal)) { cmSystemTools::Error("Generator: execution of msdev failed."); // return to the original directory |