summaryrefslogtreecommitdiffstats
path: root/Source/cmExecProgramCommand.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2002-10-23 20:57:21 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2002-10-23 20:57:21 (GMT)
commit48b74fd034c3acc27b96957d552715697156655c (patch)
tree9d170e834d46cc1f44399a1cc1378e7a46fbac75 /Source/cmExecProgramCommand.cxx
parentfa782867b33a8a5569d88de5b1f0b5f968e3cd6f (diff)
downloadCMake-48b74fd034c3acc27b96957d552715697156655c.zip
CMake-48b74fd034c3acc27b96957d552715697156655c.tar.gz
CMake-48b74fd034c3acc27b96957d552715697156655c.tar.bz2
ENH: if output variable turn verbose off
Diffstat (limited to 'Source/cmExecProgramCommand.cxx')
-rw-r--r--Source/cmExecProgramCommand.cxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx
index 6ff22e9..03a0af0 100644
--- a/Source/cmExecProgramCommand.cxx
+++ b/Source/cmExecProgramCommand.cxx
@@ -49,6 +49,7 @@ bool cmExecProgramCommand::InitialPass(std::vector<std::string> const& args)
return false;
}
output_variable = args[i];
+ haveoutput_variable = false;
count ++;
}
else if(args[i] == "RETURN_VALUE")
@@ -66,6 +67,7 @@ bool cmExecProgramCommand::InitialPass(std::vector<std::string> const& args)
return false;
}
return_variable = args[i];
+ havereturn_variable = false;
count ++;
}
else if(args[i] == "ARGS")
@@ -94,17 +96,22 @@ bool cmExecProgramCommand::InitialPass(std::vector<std::string> const& args)
{
command = args[0];
}
+ bool verbose = true;
+ if(output_variable.size() > 0)
+ {
+ verbose = false;
+ }
int retVal = 0;
std::string output;
if(args.size() - count == 2)
{
cmSystemTools::MakeDirectory(args[1].c_str());
cmSystemTools::RunCommand(command.c_str(), output, retVal,
- cmSystemTools::ConvertToOutputPath(args[1].c_str()).c_str());
+ cmSystemTools::ConvertToOutputPath(args[1].c_str()).c_str(), verbose);
}
else
{
- cmSystemTools::RunCommand(command.c_str(), output, retVal);
+ cmSystemTools::RunCommand(command.c_str(), output, retVal, 0, verbose);
}
if ( output_variable.size() > 0 )