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/cmInstallCommand.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/cmInstallCommand.cxx')
-rw-r--r-- | Source/cmInstallCommand.cxx | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index c30cf85..2d7d7cc 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -777,19 +777,8 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args) this->Makefile->GetLocalGenerator()->GetGlobalGenerator() ->GetExportSets()[exports.GetString()]->AddTargetExport(te); - std::vector<std::string> dirs = includesArgs.GetIncludeDirs(); - if(!dirs.empty()) - { - std::string dirString; - const char *sep = ""; - for (std::vector<std::string>::const_iterator it = dirs.begin(); - it != dirs.end(); ++it) - { - te->InterfaceIncludeDirectories += sep; - te->InterfaceIncludeDirectories += *it; - sep = ";"; - } - } + te->InterfaceIncludeDirectories = + cmJoin(includesArgs.GetIncludeDirs(), ";"); } } |