diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-09-28 16:19:58 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-09-28 16:19:58 +0300 |
| commit | 23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (patch) | |
| tree | 96dad57dc1b9946a3cbec98473b3ec2534a455f2 /win | |
| parent | a53f3c6d3cfa50b15b1aff26bc9479eb582d8611 (diff) | |
| parent | 078e510e0a75510cd2af8aebe2f300987d10e4d2 (diff) | |
| download | mariadb-git-23af6f5942e7235a7c14a36cb8dd0d2796b5ef37.tar.gz | |
Merge branch '10.0' of github.com:MariaDB/server into 10.0
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | win/packaging/create_msi.cmake.in | 1 |
2 files changed, 8 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") diff --git a/win/packaging/create_msi.cmake.in b/win/packaging/create_msi.cmake.in index c2ab648a6db..1f847a39695 100644 --- a/win/packaging/create_msi.cmake.in +++ b/win/packaging/create_msi.cmake.in @@ -434,6 +434,7 @@ EXECUTE_PROCESS( IF(SIGNCODE) EXECUTE_PROCESS( COMMAND ${SIGNTOOL_EXECUTABLE} sign ${SIGNTOOL_PARAMETERS} + /d ${CPACK_PACKAGE_FILE_NAME}.msi ${CPACK_PACKAGE_FILE_NAME}.msi ) ENDIF() |