|
@@ -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
|