diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-12 14:41:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-12 14:41:02 (GMT) |
| commit | dd6c596c12070c0fdc71cb11ac154e99111fb6e0 (patch) | |
| tree | 27fc1aa3fb5d409e619f590ede5fee3bf477f925 /Source/cmMakefile.cxx | |
| parent | d9a6ea4599eb3b736b4e695a9ffd5d8a51eac059 (diff) | |
| parent | 55a73e6b1f70b3c8a783b130dff4c4689cea5ba2 (diff) | |
| download | CMake-dd6c596c12070c0fdc71cb11ac154e99111fb6e0.zip CMake-dd6c596c12070c0fdc71cb11ac154e99111fb6e0.tar.gz CMake-dd6c596c12070c0fdc71cb11ac154e99111fb6e0.tar.bz2 | |
Merge topic 'join-algorithm'
55a73e6b Use the cmJoin algorithm where possible.
8dc8d756 cmStandardIncludes: Add a join algorithm for string containers.
b5813cee cmInstallCommand: Remove unused variable.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index fae32a4..d188331 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1791,22 +1791,12 @@ void cmMakefile::AddIncludeDirectories(const std::vector<std::string> &incs, return; } - std::string incString; - std::string sep; - - for(std::vector<std::string>::const_iterator li = incs.begin(); - li != incs.end(); ++li) - { - incString += sep + *li; - sep = ";"; - } - std::vector<cmValueWithOrigin>::iterator position = before ? this->IncludeDirectoriesEntries.begin() : this->IncludeDirectoriesEntries.end(); cmListFileBacktrace lfbt = this->GetBacktrace(); - cmValueWithOrigin entry(incString, lfbt); + cmValueWithOrigin entry(cmJoin(incs, ";"), lfbt); this->IncludeDirectoriesEntries.insert(position, entry); // Property on each target: |