summaryrefslogtreecommitdiffstats
path: root/Tools/msi/wix.props
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@python.org>2022-01-28 16:48:06 (GMT)
committerGitHub <noreply@github.com>2022-01-28 16:48:06 (GMT)
commit45faf151c693b6f13f78926761caea6df7242024 (patch)
tree8e45001c8431c55aba7a03015e8e449361b3d4c0 /Tools/msi/wix.props
parentdb77bcd6092f3c174ae855522411ab83854d65a8 (diff)
downloadcpython-45faf151c693b6f13f78926761caea6df7242024.zip
cpython-45faf151c693b6f13f78926761caea6df7242024.tar.gz
cpython-45faf151c693b6f13f78926761caea6df7242024.tar.bz2
bpo-33125: Enables building traditional installer for Windows ARM64 (GH-30885)
Also makes a few general improvements to the build process and removes some dead code.
Diffstat (limited to 'Tools/msi/wix.props')
-rw-r--r--Tools/msi/wix.props2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/msi/wix.props b/Tools/msi/wix.props
index 7269d34..d8ced31 100644
--- a/Tools/msi/wix.props
+++ b/Tools/msi/wix.props
@@ -4,7 +4,7 @@
<PropertyGroup>
<WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(MSBuildThisFileDirectory)\Wix')">$(MSBuildThisFileDirectory)\Wix\</WixInstallPath>
- <WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(ExternalsDir)\windows-installer\wix')">$(ExternalsDir)\windows-installer\wix\</WixInstallPath>
+ <WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(ExternalsDir)\windows-installer\wix-314')">$(ExternalsDir)\windows-installer\wix-314\</WixInstallPath>
<WixInstallPath Condition="'$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.10@InstallRoot)</WixInstallPath>
<WixInstallPath Condition="'$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.10@InstallRoot)</WixInstallPath>
<WixTargetsPath>$(WixInstallPath)\Wix.targets</WixTargetsPath>