From 42333aa353515ccbb68c6e74109cd34a34d1abe6 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 4 Dec 2015 09:02:35 -0800 Subject: CMake+PortableApps: Include the VC runtime (second try). Move the code that finds the Visual C++ redistributable DLLs to its own module. Run it before we create our NSIS and PortableApps targets. Add a PortableApps target that copies the redistributable This reverts commit 403fa9fbe0cdba3f443ec4674cda40092525ffe4. Bug: 11800 Change-Id: I081d8fd3f5f37dd590659ca8f2bd309642a9a9df Reviewed-on: https://code.wireshark.org/review/12431 Reviewed-by: Gerald Combs (cherry picked from commit 5b580834aeeee8477039bc099c49c21aeeb3b71f) Reviewed-on: https://code.wireshark.org/review/12432 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot --- Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 4f5544b0f7..d104ea18cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1328,6 +1328,7 @@ EXTRA_DIST = \ cmake/modules/FindLUA.cmake \ cmake/modules/FindLYNX.cmake \ cmake/modules/FindM.cmake \ + cmake/modules/FindMSVC_REDIST.cmake \ cmake/modules/FindNL.cmake \ cmake/modules/FindNSIS.cmake \ cmake/modules/FindOS_X_FRAMEWORKS.cmake \ -- cgit v1.2.3