WL#16310: MSI: Fix default install path

Author: rsomla1

packaging/WiX/CMakeLists.txt

@@ -183,16 +183,17 @@ else()
 endif()
 show(BUNDLE_RUNTIME_LIBRARIES)
 
-set(PROGRAM_FILES_FOLDER StandardDirectory)
 
 if(IS64BIT)
   set(IS64BIT "yes")
   set(PLATFORM x64)
   set(UPGRADE_CODE "${UPGRADE_CODE_64_BIT}")
+  set(PROGRAM_FILES_FOLDER ProgramFiles64Folder)
 else()
   set(IS64BIT "no")
   set(PLATFORM x86)
   set(UPGRADE_CODE "${UPGRADE_CODE_32_BIT}")
+  set(PROGRAM_FILES_FOLDER ProgramFilesFolder)
 endif()
 show(IS64BIT)
 

packaging/WiX/connector-cpp.wxs.in

@@ -2,24 +2,24 @@
 
 <!--
    Copyright (c) 2010, 2024, Oracle and/or its affiliates.
- 
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
    as published by the Free Software Foundation.
- 
+
    This program is designed to work with certain software (including
    but not limited to OpenSSL) that is licensed under separate terms, as
    designated in a particular file or component or in included license
    documentation. The authors of MySQL hereby grant you an additional
    permission to link the program and your derivative works with the
    separately licensed software that they have either included with
    the program or referenced in the documentation.
- 
+
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
    the GNU General Public License, version 2.0, for more details.
- 
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation, Inc.,
    51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -180,12 +180,12 @@
     <!--WIX_INCLUDES -->
     @WIX_INCLUDES@
 
-    <Directory Id="@PROGRAM_FILES_FOLDER@">
+    <StandardDirectory Id="@PROGRAM_FILES_FOLDER@">
       <Directory Id="directory.MySQL" Name="MySQL">
         <Directory Id="INSTALLDIR" Name="@WIX_INSTALL_DIR@">
         </Directory>
       </Directory>
-    </Directory>
+    </StandardDirectory>
 
   </Package>