From 6949b71ff13e222925c0939c50f669e23b6da785 Mon Sep 17 00:00:00 2001 From: Domen Vrankar Date: Sun, 14 May 2017 23:10:34 +0200 Subject: 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 --- Source/CPack/cmCPackGenerator.cxx | 1 + 1 file changed, 1 insertion(+) 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 filesAfter = glA.GetFiles(); std::sort(filesAfter.begin(), filesAfter.end()); -- cgit v0.12