diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2018-12-29 19:51:08 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-12-29 20:56:19 +0000 |
| commit | b0da9cf6d4f246e5fdf81466adc9532ab09aa8f8 (patch) | |
| tree | 167a722077dae852ef30221a583dbccb32e51e64 | |
| parent | 1fe5921b7bd942022d2a2f5c0a27bb0d479ae6bd (diff) | |
CMake output: Show Windows paths for the VC redist files
Purely cosmetic, show the various VC redist paths using the native
format.
Change-Id: I96d0b088f703e3e8dea6623ec258139eff066d90
Reviewed-on: https://code.wireshark.org/review/31251
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 7ad4180ec6..2dd09cff11 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -107,7 +107,8 @@ find_path(VCINSTALLDIR Redist PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\Microsoft\\VisualStudio\\SxS\\VS7;${_msvs_version}]\\VC" NO_DEFAULT_PATH ) -message(STATUS "Using VCINSTALLDIR: ${VCINSTALLDIR}") +file(TO_NATIVE_PATH "${VCINSTALLDIR}" VCINSTALLDIR_NATIVE) +message(STATUS "Using VCINSTALLDIR: ${VCINSTALLDIR_NATIVE}") # Visual Studio Community 2017 version 15.7.5 uses VCRT 14.14.26405, but an # earlier version used 14.10.25008. Let's just glob for the right value. diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index a38d483663..cbb814ba0f 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -99,8 +99,8 @@ find_path(MERGE_MODULE_DIR ${MERGE_MODULE} "$ENV{PROGRAMFILES}/Common Files/Merge Modules" NO_DEFAULT_PATH ) - -message(STATUS "Using ${MERGE_MODULE_DIR}/Microsoft_${MSVC_CRT_VERSION}_CRT_${TARGET_MACHINE}.msm for the WiX installer") +file(TO_NATIVE_PATH "${MERGE_MODULE_DIR}/Microsoft_${MSVC_CRT_VERSION}_CRT_${TARGET_MACHINE}.msm" MSM_NATIVE_PATH) +message(STATUS "Using ${MSM_NATIVE_PATH} for the WiX installer") # DependentComponents.wxi. Can be created at configure time. set(_all_manifest_wix "${CMAKE_CURRENT_BINARY_DIR}/DependentComponents.wxs") |