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.
This commit is contained in:
parent
737964dcd1
commit
09cb64682b
@ -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")
|
||||
|
Loading…
x
Reference in New Issue
Block a user