Test

Author: metsma

CMakeLists.txt

@@ -206,7 +206,16 @@ else()
 	set(MSI_FILE "ID-Updater-${VERSION}$ENV{VER_SUFFIX}.${MSVC_CXX_ARCHITECTURE_ID}")
 	get_target_property(qtCore_install_prefix Qt6::qmake IMPORTED_LOCATION)
 	get_filename_component(qtCore_install_prefix ${qtCore_install_prefix} DIRECTORY)
+	if(CMAKE_GENERATOR MATCHES "Visual Studio")
+		set(WIX_VCTOOLSREDISTDIR_ARG "$(VCToolsRedistDir)")
+		set(WIX_VCVER_ARG "VCVER=$(PlatformToolsetVersion)")
+	else()
+		set(WIX_VCTOOLSREDISTDIR_ARG "$ENV{VCToolsRedistDir}")
+		set(WIX_VCVER_ARG "VisualStudioVersion=$ENV{VisualStudioVersion}")
+	endif()
 	add_custom_target(installer DEPENDS ${PROJECT_NAME}
+		COMMAND echo "PlatformToolsetVersion is $(PlatformToolsetVersion)"
+		COMMAND echo "VCToolsRedistDir is $(VCToolsRedistDir)"
 		COMMAND wix.exe build -nologo
 			-arch ${MSVC_CXX_ARCHITECTURE_ID}
 			-ext WixToolset.UI.wixext
@@ -217,8 +226,8 @@ else()
 			-d qt_suffix=$<$<CONFIG:Debug>:d>
 			-d libs_path="${SSL_PATH}"
 			-d updater_path=$<TARGET_FILE:${PROJECT_NAME}>
-			-d VCTOOLSREDISTDIR="$(VCToolsRedistDir)"
-			-d VCVER="$(PlatformToolsetVersion)"
+			-d VCTOOLSREDISTDIR=${WIX_VCTOOLSREDISTDIR_ARG}
+			-d ${WIX_VCVER_ARG}
 			${CMAKE_SOURCE_DIR}/idupdater.wxs
 			${CMAKE_SOURCE_DIR}/common/WelcomeDlg.wxs
 			${CMAKE_SOURCE_DIR}/common/WixUI_Minimal.wxs

idupdater.wxs

@@ -1,19 +1,21 @@
-<?if $(sys.BUILDARCH) = x86 ?>
+<?if $(sys.BUILDARCH) = x86 ?>
   <?define OpenSSLSuffix = "" ?>
 <?else?>
   <?define OpenSSLSuffix = "-$(sys.BUILDARCH)" ?>
 <?endif?>
 
-<?if $(env.VisualStudioVersion) = "17.0" ?>
-<?define VCVER = "143" ?>
-<?elseif $(env.VisualStudioVersion) = "16.0" ?>
-<?define VCVER = "142" ?>
+<?ifndef $(var.VCVER) ?>
+  <?if $(var.VisualStudioVersion) = "17.0" ?>
+    <?define VCVER = "143" ?>
+  <?elseif $(var.VisualStudioVersion) = "16.0" ?>
+    <?define VCVER = "142" ?>
+  <?endif?>
 <?endif?>
 
 <?if $(var.qt_suffix) = "d" ?>
-<?define VCPATH = "$(env.VCTOOLSREDISTDIR)\Debug_NonRedist\$(sys.BUILDARCH)\Microsoft.VC$(var.VCVER).DebugCRT" ?>
+<?define VCPATH = "$(var.VCTOOLSREDISTDIR)\Debug_NonRedist\$(sys.BUILDARCH)\Microsoft.VC$(var.VCVER).DebugCRT" ?>
 <?else?>
-<?define VCPATH = "$(env.VCTOOLSREDISTDIR)\$(sys.BUILDARCH)\Microsoft.VC$(var.VCVER).CRT" ?>
+<?define VCPATH = "$(var.VCTOOLSREDISTDIR)\$(sys.BUILDARCH)\Microsoft.VC$(var.VCVER).CRT" ?>
 <?endif?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"