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

ENH: Use the new RunCommand

This commit is contained in:
Andy Cedilnik 2003-08-03 22:34:37 -04:00
parent 32c2ed2ef3
commit 0b150f69c2
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGlobalGenerator.cxx
View File

@ -24,6 +24,8 @@
#include <windows.h> #include <windows.h>
#endif #endif
int cmGlobalGenerator::s_TryCompileTimeout = 0;
cmGlobalGenerator::cmGlobalGenerator() cmGlobalGenerator::cmGlobalGenerator()
{ {
// do nothing duh // do nothing duh
@ -485,7 +487,9 @@ int cmGlobalGenerator::TryCompile(const char *, const char *bindir,
makeCommand += " all"; makeCommand += " all";
} }
int retVal; int retVal;
if (!cmSystemTools::RunCommand(makeCommand.c_str(), *output, retVal, 0, false)) int timeout = cmGlobalGenerator::s_TryCompileTimeout;
if (!cmSystemTools::RunSingleCommand(makeCommand.c_str(), output,
&retVal, 0, false, timeout))
{ {
cmSystemTools::Error("Generator: execution of make failed."); cmSystemTools::Error("Generator: execution of make failed.");
// return to the original directory // return to the original directory

1
Source/cmGlobalGenerator.h
View File

@ -102,6 +102,7 @@ public:
void SetConfiguredFilesPath(const char* s){m_ConfiguredFilesPath = s;} void SetConfiguredFilesPath(const char* s){m_ConfiguredFilesPath = s;}
void GetLocalGenerators(std::vector<cmLocalGenerator *>&g) { g = m_LocalGenerators;} void GetLocalGenerators(std::vector<cmLocalGenerator *>&g) { g = m_LocalGenerators;}
static int s_TryCompileTimeout;
protected: protected:
cmStdString m_FindMakeProgramFile; cmStdString m_FindMakeProgramFile;

6
Source/cmGlobalVisualStudio6Generator.cxx
View File

@ -96,7 +96,7 @@ int cmGlobalVisualStudio6Generator::TryCompile(const char *,
cmSystemTools::ChangeDirectory(bindir); cmSystemTools::ChangeDirectory(bindir);
// if there are spaces in the makeCommand, assume a full path // if there are spaces in the makeCommand, assume a full path
// and convert it to a path with no spaces in it as the // and convert it to a path with no spaces in it as the
// RunCommand does not like spaces // RunSingleCommand does not like spaces
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
if(makeCommand.find(' ') != std::string::npos) if(makeCommand.find(' ') != std::string::npos)
{ {
@ -116,7 +116,9 @@ int cmGlobalVisualStudio6Generator::TryCompile(const char *,
} }
makeCommand += " - Debug\""; makeCommand += " - Debug\"";
int retVal; int retVal;
if (!cmSystemTools::RunCommand(makeCommand.c_str(), *output, retVal, 0, false)) int timeout = cmGlobalGenerator::s_TryCompileTimeout;
if (!cmSystemTools::RunSingleCommand(makeCommand.c_str(), output,
&retVal, 0, false, timeout))
{ {
std::string e = "Error executing make program \""; std::string e = "Error executing make program \"";
e += originalCommand; e += originalCommand;

7
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -66,7 +66,7 @@ int cmGlobalVisualStudio7Generator::TryCompile(const char *,
// if there are spaces in the makeCommand, assume a full path // if there are spaces in the makeCommand, assume a full path
// and convert it to a path with no spaces in it as the // and convert it to a path with no spaces in it as the
// RunCommand does not like spaces // RunSingleCommand does not like spaces
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
if(makeCommand.find(' ') != std::string::npos) if(makeCommand.find(' ') != std::string::npos)
{ {
@ -86,8 +86,9 @@ int cmGlobalVisualStudio7Generator::TryCompile(const char *,
} }
int retVal; int retVal;
if (!cmSystemTools::RunCommand(makeCommand.c_str(), *output, retVal, int timeout = cmGlobalGenerator::s_TryCompileTimeout;
0, false)) if (!cmSystemTools::RunSingleCommand(makeCommand.c_str(), output, &retVal,
0, false, timeout))
{ {
cmSystemTools::Error("Generator: execution of devenv failed."); cmSystemTools::Error("Generator: execution of devenv failed.");
// return to the original directory // return to the original directory