diff options
| author | Dario Lombardo <lomato@gmail.com> | 2016-11-04 11:55:33 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2016-11-09 20:31:06 +0000 |
| commit | cb0697c99e4e09feac58bfe24f82b9cc034d7b64 (patch) | |
| tree | eefab11e5f11dedf30d7fb5248d6f12b59d6ab4f /CPackConfig.txt | |
| parent | f1486a9f93de20be6741631fb1522208a00a77f3 (diff) | |
| download | wireshark-cb0697c99e4e09feac58bfe24f82b9cc034d7b64.tar.gz | |
CMake: fix cpack archive name to include version
CPACK_PACKAGE_VERSION is used before setting its value. Remove
spurious CPACK_SYSTEM_NAME usage.
Before:
CPack: - package: wireshark/build-test/wireshark--.tar.bz2 generated.
After
CPack: - package: wireshark/build-test/wireshark-2.3.0.tar.bz2 generated.
Change-Id: I6f12017113f64b9c759a3fbd930cb3ee0807811d
Reviewed-on: https://code.wireshark.org/review/18669
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'CPackConfig.txt')
| -rw-r--r-- | CPackConfig.txt | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/CPackConfig.txt b/CPackConfig.txt index 2028864508..2df36f6c86 100644 --- a/CPackConfig.txt +++ b/CPackConfig.txt @@ -30,30 +30,10 @@ if(WIN32) # - Add Qt DLLs # - Add set(CPACK_PACKAGE_NAME Wireshark) - set(CPACK_GENERATOR "WIX") else() - # XXX Currently unused and untested. set(CPACK_PACKAGE_NAME wireshark) - set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_SYSTEM_NAME}-${CPACK_PACKAGE_VERSION}) - # Win: WIX, NSIS, ZIP, SOURCE_ZIP, CYGWIN_BINARY, SOURCE_CYGWIN, - # Linux/Unix: DEB, RPM, STGZ, TBZ2, TZ, SOURCE_TZ, SOURCE_TGZ - # OSX: PACKAGEMAKER, OSXX11 - # Syntax: "Type1;Type2;Type3" - set(CPACK_GENERATOR "TBZ2") - set(CPACK_SOURCE_GENERATOR "TBZ2") - set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr") endif() -# WiX - -# WiX wants RTF. CPack+WiX wants a file extension. -set(CPACK_WIX_LICENSE_RTF "${CMAKE_SOURCE_DIR}/packaging/wix/gpl-2.0.rtf") -set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/image/wireshark.ico") -#set(CPACK_WIX_UI_BANNER "${CMAKE_SOURCE_DIR}/image/wix-ui-banner.png") -#set(CPACK_WIX_UI_DIALOG "${CMAKE_SOURCE_DIR}/image/wix-ui-dialog.png") - -set(CPACK_WIX_UPGRADE_GUID "5809F81A-587D-470D-8016-DA480DAE379F") - set(CPACK_PACKAGE_DESCRIPTION "A set of command line and gui tools to capture and decode traffic") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Packet capturing and decoding") set(CPACK_PACKAGE_VENDOR "Wireshark developers") @@ -68,6 +48,32 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") set(CPACK_STRIP_FILES true) set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}") +if(NOT WIN32) + set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}) + set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr") +endif() + +# WiX + +# WiX wants RTF. CPack+WiX wants a file extension. +set(CPACK_WIX_LICENSE_RTF "${CMAKE_SOURCE_DIR}/packaging/wix/gpl-2.0.rtf") +set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/image/wireshark.ico") +#set(CPACK_WIX_UI_BANNER "${CMAKE_SOURCE_DIR}/image/wix-ui-banner.png") +#set(CPACK_WIX_UI_DIALOG "${CMAKE_SOURCE_DIR}/image/wix-ui-dialog.png") + +set(CPACK_WIX_UPGRADE_GUID "5809F81A-587D-470D-8016-DA480DAE379F") + +if(WIN32) + set(CPACK_GENERATOR "WIX") +else() + # XXX Currently unused and untested. + # Win: WIX, NSIS, ZIP, SOURCE_ZIP, CYGWIN_BINARY, SOURCE_CYGWIN, + # Linux/Unix: DEB, RPM, STGZ, TBZ2, TZ, SOURCE_TZ, SOURCE_TGZ + # OSX: PACKAGEMAKER, OSXX11 + # Syntax: "Type1;Type2;Type3" + set(CPACK_GENERATOR "TBZ2") + set(CPACK_SOURCE_GENERATOR "TBZ2") +endif() #=============================================== IF(APPLE) |