osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Look in %VCToolsRedistDir% for the VC++ redistributable. 

Look in %VCToolsRedistDir% for the redistributable that we ship with
the NSIS installer. Clarify a couple of status messages.

Change-Id: I965d15947c3d3422d7c722afa581f4f7dfc2725a
Reviewed-on: https://code.wireshark.org/review/25804
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2018-02-15 08:38:34 -08:00
parent d45bd7cb24
commit 364d9a999d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/nsis/CMakeLists.txt
View File

@ -120,13 +120,13 @@ elseif(MSVC_VERSION GREATER_EQUAL 1800)
endif()
find_program(VCREDIST_EXE "${_vcredist_name}"
PATHS "${_PROJECT_LIB_DIR}" ENV "VCINSTALLDIR"
PATHS "${_PROJECT_LIB_DIR}" $ENV{VCToolsRedistDir} $ENV{VCINSTALLDIR}
PATH_SUFFIXES ${_ws_vcredist_subdir} ${_ms_vcredist_subdir}
NO_DEFAULT_PATH
)
if(VCREDIST_EXE)
file(TO_NATIVE_PATH "${VCREDIST_EXE}" VCREDIST_EXE)
message(STATUS "Using ${VCREDIST_EXE} for the installer")
message(STATUS "Using ${VCREDIST_EXE} for the NSIS installer.")
endif()
# Ideally we would generate this at compile time using a separate cmake

2
packaging/wix/CMakeLists.txt
View File

@ -127,7 +127,7 @@ find_path(MERGE_MODULE_DIR ${MERGE_MODULE}
NO_DEFAULT_PATH
)
message(STATUS "Using ${MERGE_MODULE_DIR}/Microsoft_${MSVC_CRT_VERSION}_CRT_${TARGET_MACHINE}.msm for the installer")
message(STATUS "Using ${MERGE_MODULE_DIR}/Microsoft_${MSVC_CRT_VERSION}_CRT_${TARGET_MACHINE}.msm for the WiX installer")
# DependentComponents.wxi. Can be created at configure time.
set(_all_manifest_wix "${CMAKE_CURRENT_BINARY_DIR}/DependentComponents.wxs")