diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-31 14:12:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-31 14:12:18 (GMT) |
| commit | 4f96641ba2e0b26523f962e2c18aa83a8b91c6aa (patch) | |
| tree | 17971b95ed86c105d8261c4682abd26eacc81b99 /Source/CPack | |
| parent | 02d24c9ed29ff84104413f8543f1063e1c0f2f4f (diff) | |
| parent | 4022b28678da42425def8cc42c7df453061d45ea (diff) | |
| download | CMake-4f96641ba2e0b26523f962e2c18aa83a8b91c6aa.zip CMake-4f96641ba2e0b26523f962e2c18aa83a8b91c6aa.tar.gz CMake-4f96641ba2e0b26523f962e2c18aa83a8b91c6aa.tar.bz2 | |
Merge topic 'cxx11-clang-format'
4022b286 clang-tidy: blacklist "modernize" checks
2b4c32c9 clang-format: format all code as Cpp11
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1191
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index b65eb64..44c7915 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -313,7 +313,7 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories( const std::string& tempDir = tempInstallDirectory; for (it = installDirectoriesVector.begin(); it != installDirectoriesVector.end(); ++it) { - std::vector<std::pair<std::string, std::string> > symlinkedFiles; + std::vector<std::pair<std::string, std::string>> symlinkedFiles; cmCPackLogger(cmCPackLog::LOG_DEBUG, "Find files" << std::endl); cmsys::Glob gl; std::string top = *it; @@ -377,8 +377,7 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories( } /* rebuild symlinks in the installed tree */ if (!symlinkedFiles.empty()) { - std::vector<std::pair<std::string, std::string> >::iterator - symlinkedIt; + std::vector<std::pair<std::string, std::string>>::iterator symlinkedIt; std::string curDir = cmSystemTools::GetCurrentWorkingDirectory(); std::string goToDir = tempDir; goToDir += "/" + subdir; |