diff options
| author | Domen Vrankar <domen.vrankar@gmail.com> | 2017-05-14 21:10:34 (GMT) |
|---|---|---|
| committer | Domen Vrankar <domen.vrankar@gmail.com> | 2017-05-14 21:45:18 (GMT) |
| commit | 6949b71ff13e222925c0939c50f669e23b6da785 (patch) | |
| tree | a40c63086749b4d64bf3b6d97fca93f05f4953f5 | |
| parent | 3eb0f08084173f344851a36876864c58a301d5ea (diff) | |
| download | CMake-6949b71ff13e222925c0939c50f669e23b6da785.zip CMake-6949b71ff13e222925c0939c50f669e23b6da785.tar.gz CMake-6949b71ff13e222925c0939c50f669e23b6da785.tar.bz2 | |
CPack unify component/monolithic package symlink handling
Non component package generation was recursing through
symlinks while monolithic package generation did not.
This was causing component archive packages to contain
both symlink and a directory with the same name on the
same level if symlink contained files which caused errors
during extraction of such packages.
Closes #16051
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index c873529..3e113d3 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -795,6 +795,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cmsys::Glob glA; glA.RecurseOn(); glA.SetRecurseListDirs(true); + glA.SetRecurseThroughSymlinks(false); glA.FindFiles(findExpr); std::vector<std::string> filesAfter = glA.GetFiles(); std::sort(filesAfter.begin(), filesAfter.end()); |