summaryrefslogtreecommitdiffstats
path: root/Source/cmake.h
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-08-02 19:09:57 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-08-02 19:09:57 (GMT)
commit2444d6f55eb0e66893c0e86b10e466ceaae32e31 (patch)
tree3d0194718b7701ed40cc3a37d78b75b950452998 /Source/cmake.h
parent39faba7e30151a6c884d2ec38932235223b9821d (diff)
parenta343bc1c764c87b20edbdf960d870fd4b084ce8a (diff)
downloadCMake-2444d6f55eb0e66893c0e86b10e466ceaae32e31.zip
CMake-2444d6f55eb0e66893c0e86b10e466ceaae32e31.tar.gz
CMake-2444d6f55eb0e66893c0e86b10e466ceaae32e31.tar.bz2
Merge topic 'split-stdout-stderr'
a343bc1 RunSingleCommand: Avoid assignment in condition 642f100 RunSingleCommand: Add a OUTPUT_NORMAL flag. 856a9e4 RunSingleCommand: Replace verbose boolean with enum 4096066 RunSingleCommand: Fix indentation
Diffstat (limited to 'Source/cmake.h')
-rw-r--r--Source/cmake.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmake.h b/Source/cmake.h
index b791b7c..f2a2ae3 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -364,7 +364,8 @@ class cmake
const std::string& target,
const std::string& config,
const std::vector<std::string>& nativeOptions,
- bool clean);
+ bool clean,
+ cmSystemTools::OutputOption outputflag);
void UnwatchUnusedCli(const char* var);
void WatchUnusedCli(const char* var);