Преглед на файлове

Switch back to preMachine and escalation for now.

Tobias Hieta преди 8 години
родител
ревизия
924793b5e5
променени са 2 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 1 0
      CMakeModules/WindowsInstaller.cmake
  2. 1 1
      bundle/win/PMP.wxs

+ 1 - 0
CMakeModules/WindowsInstaller.cmake

@@ -139,6 +139,7 @@ wix_harvest_directory("${CMAKE_INSTALL_PREFIX}" files.wxs CGROUP ProgramFilesCom
 wix_create_installer(PMP.msi 
                      WXS_FILES files.wxs "${PROJECT_SOURCE_DIR}/bundle/win/PMP.wxs"
                      EXTENSIONS WixUtilExtension WixFirewallExtension
+                     BASEDIR "${PROJECT_SOURCE_DIR}/bundle/win"
 )
 
 wix_create_installer(PlexMediaPlayer-${VERSION_STRING}-windows-x64.exe

+ 1 - 1
bundle/win/PMP.wxs

@@ -18,7 +18,7 @@
     <Product Id="*" Name="$(var.ProductName)" Language="1033" Version="$(var.Version)" Manufacturer="Plex" UpgradeCode="$(var.ProductUUID)">
 
     <!-- Package Ids change on every build, by definition -->
-    <Package Id="*" Platform="x64" InstallerVersion="405" Compressed="yes" Description="$(var.ProductDesc)" />
+    <Package Id="*" Platform="x64" InstallerVersion="405" Compressed="yes" Description="$(var.ProductDesc)" InstallScope="perMachine" />
     
     <!-- allow for reinstall, this is needed to force installation when the version match -->
     <Property Id="REINSTALLMODE" Value="amus"/>