Bug#31922612 UPDATE WIX VERSION USED TO CREATE MSI PACKAGES

Do not use WiX version 3, 3.5, or 3.6. Use version 3.8 or 3.10.

When searching for heat.exe, look both in the top level of the WiX
package and under bin/.

Reviewed-by: Thomas Neilsen <[email protected]>

Author: jdduncan

packaging/WiX/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
 # 
 # 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,
@@ -26,19 +26,14 @@ ENDIF()
 
 FIND_PATH(WIX_DIR heat.exe
    $ENV{WIX_DIR}/bin
+   $ENV{WIX_DIR}
    $ENV{ProgramFiles}/wix/bin
-  "$ENV{ProgramFiles}/Windows Installer XML v3/bin"
-  "$ENV{ProgramFiles}/Windows Installer XML v3.5/bin"
-  "$ENV{ProgramFiles}/WiX Toolset V3.6/bin"
-  "$ENV{ProgramFiles}/WiX Toolset V3.8/bin"
+   "$ENV{ProgramFiles}/WiX Toolset V3.8/bin"
+   "$ENV{ProgramFiles}/WiX Toolset V3.8"
+   "$ENV{ProgramFiles}/WiX Toolset V3.10/bin"
+   "$ENV{ProgramFiles}/WiX Toolset V3.10"
 )
 
-IF(NOT WIX_DIR)
-  FIND_PATH(WIX_DIR heat.exe
-    "$ENV{ProgramFiles}/WiX Toolset V3.10/bin"
-  )
-ENDIF()
-
 IF(NOT WIX_DIR)
   IF(NOT _WIX_DIR_CHECKED)
     SET(_WIX_DIR_CHECKED 1 CACHE INTERNAL "")