Merge branch 'msys2-ldd' into 'master'

msys2/bundle: properly parse ldd output for dll bundling on windows

See merge request xonotic/netradiant!128

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c13b2ca86c019b25796ec4f1334141082068bff9..7498450870d5e6e314ed3c3da71f4c1f54cce71a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,7 +216,7 @@ if (BUILD_BINARIES)
         if (BUNDLE_LIBRARIES)
             add_custom_command(TARGET ${target} POST_BUILD
                     COMMAND bash
-                    ARGS -c "ldd '$<TARGET_FILE:${target}>' | grep -v /c/Windows | awk '{ print $1 }' | while read dll; do cp \"$(which $dll)\" '${PROJECT_BINARY_DIR}'; done"
+                    ARGS -c "ldd '$<TARGET_FILE:${target}>' | egrep -i '\\.dll ' | grep -iv '/c/Windows' | awk '{ print $1 }' | while read dll; do cp --preserve=timestamps \"$(which $dll)\" '${PROJECT_BINARY_DIR}'; done"
                     VERBATIM
                     )
         endif ()