diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-12-04 09:02:35 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-12-04 22:32:32 +0000 |
| commit | 42333aa353515ccbb68c6e74109cd34a34d1abe6 (patch) | |
| tree | b014ccf8e065a0a482a7204c424e148db6f6634d /Makefile.am | |
| parent | 4b206d1b06f829bcfe3268fd166d5500ae5e3aaf (diff) | |
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 <gerald@wireshark.org>
(cherry picked from commit 5b580834aeeee8477039bc099c49c21aeeb3b71f)
Reviewed-on: https://code.wireshark.org/review/12432
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
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 \ |