diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2016-04-06 17:25:18 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-04-08 04:46:36 +0000 |
| commit | 5601d6057b9717cd415bfda75b58cc0aa1248cbc (patch) | |
| tree | 0aed15379e18b2151f13c3ec0fdf9acffbf0e245 /packaging | |
| parent | 58c7b5548c4861aae12f91fcd5310883e85a3a02 (diff) | |
[MSVC2015] Fix finding of vcredist when using MSVC2015.
Change-Id: I23ddc8c7601e61c7c092a258e4e540bc475e020a
Reviewed-on: https://code.wireshark.org/review/14831
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 89d73a518d..eead611e51 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -102,13 +102,15 @@ if(BUILD_wireshark_gtk AND GTK_FOUND) set (GTK_DIR "\${STAGING_DIR}") endif() -# This *should* be compatible with the way we currently do things. -if(MSVC12) - set(_vcredist_name "vcredist_${TARGET_MACHINE}.exe") - find_program(VCREDIST_EXE "${_vcredist_name}" - HINTS "${WIRESHARK_LIB_DIR}/vcredist_MSVC2013" "${WIRESHARK_LIB_DIR}" - ) - file(TO_NATIVE_PATH "${VCREDIST_EXE}" VCREDIST_EXE) +# Use the vcredist that comes with Visual Studio (From MSVC 2013?) +set(_vcredist_name "vcredist_${TARGET_MACHINE}.exe") +find_program(VCREDIST_EXE "${_vcredist_name}" + PATHS ENV "VCINSTALLDIR" + PATH_SUFFIXES "redist/1033" +) +if(VCREDIST_EXE) + file(TO_NATIVE_PATH "${VCREDIST_EXE}" _vcredist_exe) + message(STATUS "Using ${_vcredist_exe} for the installer") endif() if(NOT ENABLE_STATIC) |