diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-11 19:35:53 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-08-11 19:39:04 +0000 |
| commit | 09cb64682bda8648b0cdad606b169b4d592f839d (patch) | |
| tree | edac022ac1b477b11713a99ac7eceec12cf73073 /win | |
| parent | 737964dcd12e61ae7fb4b47505158e2fecce9f2b (diff) | |
| download | mariadb-git-09cb64682bda8648b0cdad606b169b4d592f839d.tar.gz | |
Windows : fix search for WiX root directory when using 64bit cmake
"C:\Program Files (x86)" directory needs to be checked as well in
this case.
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt index 0535a486d57..1682bae6986 100644 --- a/win/packaging/CMakeLists.txt +++ b/win/packaging/CMakeLists.txt @@ -24,10 +24,13 @@ ENDIF() SET(MANUFACTURER "MariaDB Corporation Ab") -FIND_PATH(WIX_DIR heat.exe - "$ENV{ProgramFiles}/WiX Toolset v3.9/bin" - "$ENV{ProgramFiles}/WiX Toolset v3.10/bin" -) +SET(WIX_BIN_PATHS) +FOREACH(WIX_VER 3.9 3.10 3.11) + LIST(APPEND WIX_BIN_PATHS "$ENV{ProgramFiles}/WiX Toolset v${WIX_VER}/bin") + LIST(APPEND WIX_BIN_PATHS "$ENV{ProgramFiles} (x86)/WiX Toolset v${WIX_VER}/bin") +ENDFOREACH() + +FIND_PATH(WIX_DIR heat.exe ${WIX_BIN_PATHS}) SET(CPACK_WIX_PACKAGE_BASE_NAME "MariaDB") IF(CMAKE_SIZEOF_VOID_P EQUAL 4) SET(CPACK_WIX_UPGRADE_CODE "49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3") |