diff options
| author | David Cole <david.cole@kitware.com> | 2011-08-02 19:09:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-08-02 19:09:57 (GMT) |
| commit | 2444d6f55eb0e66893c0e86b10e466ceaae32e31 (patch) | |
| tree | 3d0194718b7701ed40cc3a37d78b75b950452998 /Source/CPack/cmCPackNSISGenerator.cxx | |
| parent | 39faba7e30151a6c884d2ec38932235223b9821d (diff) | |
| parent | a343bc1c764c87b20edbdf960d870fd4b084ce8a (diff) | |
| download | CMake-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/CPack/cmCPackNSISGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index e5fe575..a1f4f2e 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -786,7 +786,8 @@ CreateComponentDescription(cmCPackComponent *component, std::string output; int retVal = -1; int res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output, &retVal, - dirName.c_str(), false, 0); + dirName.c_str(), + cmSystemTools::OUTPUT_NONE, 0); if ( !res || retVal ) { std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY"); |