diff options
author | Brad King <brad.king@kitware.com> | 2015-02-12 16:53:04 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-12 16:53:04 (GMT) |
commit | e6ae3c6ae0540de51b3d615aea3abd49ccc70a34 (patch) | |
tree | 09f74e0bf09b27dd51e95530cbee7783db3301bd /Source/cmSetCommand.cxx | |
parent | fc7e15691a870f8f5e199e615279c7eb4dba8f6f (diff) | |
parent | 7c3f637680ac0cdb6cec5e75ba4a9b188de5017b (diff) | |
download | CMake-e6ae3c6ae0540de51b3d615aea3abd49ccc70a34.zip CMake-e6ae3c6ae0540de51b3d615aea3abd49ccc70a34.tar.gz CMake-e6ae3c6ae0540de51b3d615aea3abd49ccc70a34.tar.bz2 |
Merge topic 'use-cmRange'
7c3f6376 Convert loop into two algorithms.
8a399c8c Convert loop to the common pattern.
abfca975 Move loop inside of condition.
0b61b86d Handle last element outside of the loop.
e21f7829 cmTarget: Use a sorted vector in place of a set.
559dc155 cmSet: Replace loop with cmJoin.
0ea71932 cmFindBase: Replace loop with cmJoin on range.
9380e85f Convert loops to cmJoin algorithm with cmRange.
bb10012f cmStringCommand: Accumulate with cmJoin and range adaptors.
0c12f1ea cmAlgorithms: Add a range adaptor and API for adjusting a range.
27c6f017 Use cmJoin to accumulate string ranges.
4e78ebbd cmAlgorithms: Add a Range container and adaptor method.
89102249 Replace common loop pattern with cmJoin
7b8725bf Convert loops populating maybe-empty content into the common pattern.
7ee56f03 Convert loops into the commonly used pattern.
0a4e5674 cmMacroCommand: Remove counting variable.
...
Diffstat (limited to 'Source/cmSetCommand.cxx')
-rw-r--r-- | Source/cmSetCommand.cxx | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx index 90d7b03..204d95b 100644 --- a/Source/cmSetCommand.cxx +++ b/Source/cmSetCommand.cxx @@ -108,17 +108,7 @@ bool cmSetCommand } // collect any values into a single semi-colon separated value list - if(static_cast<unsigned short>(args.size()) > - static_cast<unsigned short>(1 + ignoreLastArgs)) - { - value = args[1]; - size_t endPos = args.size() - ignoreLastArgs; - for(size_t i = 2; i < endPos; ++i) - { - value += ";"; - value += args[i]; - } - } + value = cmJoin(cmRange(args).advance(1).retreat(ignoreLastArgs), ";"); if (parentScope) { |