kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Attempt to fix Visual studio 6 comiling

This commit is contained in:
Andy Cedilnik 2002-09-23 09:07:41 -04:00
parent 7ee50e7ee5
commit 38baabc665
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmGlobalVisualStudio6Generator.cxx
View File

@ -42,7 +42,8 @@ void cmGlobalVisualStudio6Generator::EnableLanguage(const char*,
int cmGlobalVisualStudio6Generator::TryCompile(const char *, int cmGlobalVisualStudio6Generator::TryCompile(const char *,
const char *bindir, const char *bindir,
const char *projectName, const char *projectName,
const char *targetName) const char *targetName,
std::string *output)
{ {
// now build the test // now build the test
std::string makeCommand = std::string makeCommand =
@ -60,8 +61,6 @@ int cmGlobalVisualStudio6Generator::TryCompile(const char *,
/** /**
* Run an executable command and put the stdout in output. * Run an executable command and put the stdout in output.
*/ */
std::string output;
std::string cwd = cmSystemTools::GetCurrentWorkingDirectory(); std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
cmSystemTools::ChangeDirectory(bindir); cmSystemTools::ChangeDirectory(bindir);
@ -88,7 +87,7 @@ int cmGlobalVisualStudio6Generator::TryCompile(const char *,
makeCommand += " - Debug\""; makeCommand += " - Debug\"";
int retVal; 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."); cmSystemTools::Error("Generator: execution of msdev failed.");
// return to the original directory // return to the original directory

3
Source/cmGlobalVisualStudio6Generator.h
View File

@ -48,7 +48,8 @@ public:
* loaded commands, not as part of the usual build process. * loaded commands, not as part of the usual build process.
*/ */
virtual int TryCompile(const char *srcdir, const char *bindir, virtual int TryCompile(const char *srcdir, const char *bindir,
const char *projectName, const char *targetName); const char *projectName, const char *targetName,
std::string *output);
/** /**
* Generate the all required files for building this project/tree. This * Generate the all required files for building this project/tree. This