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 /packaging/nsis | |
| parent | 4b206d1b06f829bcfe3268fd166d5500ae5e3aaf (diff) | |
| download | wireshark-42333aa353515ccbb68c6e74109cd34a34d1abe6.tar.gz | |
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 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 564f719f12..89d73a518d 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -102,18 +102,6 @@ if(BUILD_wireshark_gtk AND GTK_FOUND) set (GTK_DIR "\${STAGING_DIR}") endif() -# CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS will likely give us a list of DLL -# paths containing spaces. We'll assume that they're all in the same -# directory and use it to create something that's easier to pass to -# NSIS. -set(MSVCR_DLL) -list(GET CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS 0 _msvcr_dll) -if(_msvcr_dll) - get_filename_component(_msvcr_dir ${_msvcr_dll} DIRECTORY) - set(MSVCR_DLL "${_msvcr_dir}/*.*") - file(TO_NATIVE_PATH "${MSVCR_DLL}" MSVCR_DLL) -endif() - # This *should* be compatible with the way we currently do things. if(MSVC12) set(_vcredist_name "vcredist_${TARGET_MACHINE}.exe") |