diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-23 15:26:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-23 15:26:38 (GMT) |
| commit | cc3611023d9d5ca9ad1eabe13dfb12577970e283 (patch) | |
| tree | 0247df02d729ae3cb23100edaa8fb3353b4a9fd7 /Tests/RunCMake | |
| parent | 15c409f4674ad3a94cb03fae145ddcf0b233a4d0 (diff) | |
| parent | bb9d71b4fee2cc4abf55e0dcbadf85c6cbe0d07d (diff) | |
| download | CMake-cc3611023d9d5ca9ad1eabe13dfb12577970e283.zip CMake-cc3611023d9d5ca9ad1eabe13dfb12577970e283.tar.gz CMake-cc3611023d9d5ca9ad1eabe13dfb12577970e283.tar.bz2 | |
Merge topic 'use-algorithms'
bb9d71b4 Replace loops with algorithms.
4afe6c26 cmAlgorithms: Add cmReverseRange adaptor.
a3a0a8c2 cmAlgorithms: Add cmFindNot algorithm.
8c74a41f cmRST: Replace two erase with a rotate and larger erase.
61fe1919 cmAlgorithms: Update concept requirement to FowardIterator
09d6125b cmAlgorithms: Move cmRotate out of 'implementation detail' namespace.
8ed6ecac cmRST: Move two algorithms beside each other.
dfe49c20 cmRST: Use std::min where appropriate.
21b0654a cmGlobalGenerator: Convert set insert algorithm to vector algorithms.
416df93a Convert some raw loops to cmWrap.
37b88d34 cmAlgorithms: Add cmWrap.
a2818093 Use cmJoin where possible.
76207b08 cmCacheManager: Replace loop with algorithm.
60c3bb73 cmGlobalGenerator: Replace loop with algorithm.
05fec779 cmTarget: Port loop to algorithm.
9c225767 cmGlobalGenerator: Replace set::insert algorithm with cmRemoveDuplicates.
...
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/File_Generate/CommandConflict-stderr.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt b/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt index da97ba4..4fa3f20 100644 --- a/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt +++ b/Tests/RunCMake/File_Generate/CommandConflict-stderr.txt @@ -1 +1 @@ -CMake Error: File to be generated by multiple different commands: .*CommandConflict-build/output_.*.txt +CMake Error: Files to be generated by multiple different commands: ".*CommandConflict-build/output_.*.txt" |