smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Wix installer use set BUILD_ARCHITECTURE in reg key where to look for msvc redist version installed

Browse source
This commit is contained in:
sithlord48 2025-05-26 22:57:43 -04:00 committed by Nick Bolton
parent 59173d6405
commit d6f8cdf51d
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deploy/windows/wix-custom.cpp
View file

@ -34,7 +34,7 @@ static std::string s_logMessageBuffer; // NOSONAR - Must be mutable.
extern "C" __declspec(dllexport) UINT __stdcall CheckVCRedist(MSIHANDLE hInstall) extern "C" __declspec(dllexport) UINT __stdcall CheckVCRedist(MSIHANDLE hInstall)
{ {
const auto kKeyName = TEXT("SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\x64"); const auto kKeyName = TEXT(kRegKey);
const auto kValueName = TEXT("Minor"); const auto kValueName = TEXT("Minor");
const auto kProperty = "VC_REDIST_VERSION_OK"; const auto kProperty = "VC_REDIST_VERSION_OK";

1
deploy/windows/wix-custom.h.in
View file

@ -7,6 +7,7 @@
#pragma once #pragma once
const auto kAppId = "@CMAKE_PROJECT_NAME@"; const auto kAppId = "@CMAKE_PROJECT_NAME@";
const auto kRegKey = "SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\@BUILD_ARCHITECTURE@";
// clang-format off // clang-format off
const auto kWindowsRuntimeMajor = @REQUIRED_MSVC_RUNTIME_MAJOR@; const auto kWindowsRuntimeMajor = @REQUIRED_MSVC_RUNTIME_MAJOR@;