mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #4413: FIX(cmake): set CMAKE_WIX_UPGRADE_GUID and generate CMAKE_WIX_PRODUCT_GUID

Browse Source
This commit is contained in:
Davide Beatrici 2020-08-11 22:59:57 +02:00 committed by GitHub
commit 54bd01f9e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/packaging.cmake
View File

@ -7,16 +7,15 @@ if(WIN32)
set(CPACK_GENERATOR WIX)
if(64_BIT)
set(CPACK_WIX_PRODUCT_GUID "E028BDFC-3FE2-4BEE-A33B-EB9C80611555")
set(CPACK_WIX_UPGRADE_GUID "E028BDFC-3FE2-4BEE-A33B-EB9C80611555")
elseif(32_BIT)
set(CPACK_WIX_PRODUCT_GUID "B0EEFCC7-8A9C-4471-AB10-CBD35BE3161D")
set(CPACK_WIX_UPGRADE_GUID "B0EEFCC7-8A9C-4471-AB10-CBD35BE3161D")
endif()
set(CPACK_WIX_CULTURES "en-us")
set(CPACK_WIX_LCID "1033")
set(CPACK_WIX_UI_BANNER "${CMAKE_SOURCE_DIR}/installer/bannrbmp.bmp")
set(CPACK_WIX_UI_DIALOG "${CMAKE_SOURCE_DIR}/installer/dlgbmp.bmp")
set(CPACK_WIX_PRODUCT_GUID "84afea8b-15e5-4cc7-b77d-27dd17030944")
set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/icons/mumble.ico")
set(CPACK_WIX_EXTENSIONS "WiXUtilExtension")
set(CPACK_WIX_TEMPLATE "wix-template.xml")
@ -53,8 +52,7 @@ endif()
if(server)
if(NOT client)
if(WIN32)
set(CPACK_WIX_PRODUCT_GUID "ccc5eaa4-0b88-4197-9e54-580d37003903")
set(CPACK_WIX_UPGRADE_GUID "03e9476f-0f75-4661-bfc9-a9daeb23d3a0")
set(CPACK_WIX_UPGRADE_GUID "03E9476F-0F75-4661-BFC9-A9DAEB23D3A0")
endif()
set(CPACK_PACKAGE_NAME "Mumble (server)")
@ -101,7 +99,6 @@ if(client AND server)
endif()
if(WIN32)
set(CPACK_WIX_UPGRADE_GUID ${CPACK_WIX_PRODUCT_GUID})
configure_file("${CMAKE_SOURCE_DIR}/installer/wix-template.xml" ${CMAKE_CURRENT_BINARY_DIR})
endif()