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/cmake.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/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 5edb7dd..5e48157 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -2320,14 +2320,7 @@ const char *cmake::GetProperty(const std::string& prop, { std::vector<std::string> enLangs; this->GlobalGenerator->GetEnabledLanguages(enLangs); - const char* sep = ""; - for(std::vector<std::string>::iterator i = enLangs.begin(); - i != enLangs.end(); ++i) - { - lang += sep; - sep = ";"; - lang += *i; - } + lang = cmJoin(enLangs, ";"); } this->SetProperty("ENABLED_LANGUAGES", lang.c_str()); } |