From b0da9cf6d4f246e5fdf81466adc9532ab09aa8f8 Mon Sep 17 00:00:00 2001 From: Graham Bloice Date: Sat, 29 Dec 2018 19:51:08 +0000 Subject: 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 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- packaging/wix/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packaging/wix') 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") -- cgit v1.2.3