summaryrefslogtreecommitdiffstats
path: root/Source/cmSystemTools.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2008-01-01 20:13:41 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2008-01-01 20:13:41 (GMT)
commitb479c6a8a98664c19eeaef40b71850c1f5315601 (patch)
treed6bdae61666c26a6872fcc8baecc5d7cdb90ba8c /Source/cmSystemTools.cxx
parent24d6ecd81cf457367c622cd166da5d49f54bf42b (diff)
downloadCMake-b479c6a8a98664c19eeaef40b71850c1f5315601.zip
CMake-b479c6a8a98664c19eeaef40b71850c1f5315601.tar.gz
CMake-b479c6a8a98664c19eeaef40b71850c1f5315601.tar.bz2
ENH: add ability to have manifest files and incremental linking with make and nmake
Diffstat (limited to 'Source/cmSystemTools.cxx')
-rw-r--r--Source/cmSystemTools.cxx52
1 files changed, 31 insertions, 21 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 6829bdc..b489c48 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -563,29 +563,16 @@ std::vector<cmStdString> cmSystemTools::ParseArguments(const char* command)
return args;
}
-bool cmSystemTools::RunSingleCommand(
- const char* command,
- std::string* output,
- int *retVal,
- const char* dir,
- bool verbose,
- double timeout)
-{
- if(s_DisableRunCommandOutput)
- {
- verbose = false;
- }
-
- std::vector<cmStdString> args = cmSystemTools::ParseArguments(command);
- if(args.size() < 1)
- {
- return false;
- }
-
+bool cmSystemTools::RunSingleCommand(std::vector<cmStdString>const& command,
+ std::string* output ,
+ int* retVal , const char* dir ,
+ bool verbose ,
+ double timeout )
+{
std::vector<const char*> argv;
- for(std::vector<cmStdString>::const_iterator a = args.begin();
- a != args.end(); ++a)
+ for(std::vector<cmStdString>::const_iterator a = command.begin();
+ a != command.end(); ++a)
{
argv.push_back(a->c_str());
}
@@ -700,6 +687,29 @@ bool cmSystemTools::RunSingleCommand(
cmsysProcess_Delete(cp);
return result;
}
+
+bool cmSystemTools::RunSingleCommand(
+ const char* command,
+ std::string* output,
+ int *retVal,
+ const char* dir,
+ bool verbose,
+ double timeout)
+{
+ if(s_DisableRunCommandOutput)
+ {
+ verbose = false;
+ }
+
+ std::vector<cmStdString> args = cmSystemTools::ParseArguments(command);
+
+ if(args.size() < 1)
+ {
+ return false;
+ }
+ return cmSystemTools::RunSingleCommand(args, output,retVal,
+ dir, verbose, timeout);
+}
bool cmSystemTools::RunCommand(const char* command,
std::string& output,
const char* dir,