From cbccf05f8be8b3c5dc2f03f31974512c84be5a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Wed, 9 Nov 2016 19:02:01 +0000 Subject: CMake: Use xz generator with cpack We already do so with autotools. Change-Id: I0d7ea052ee19a42d16e82134f2f7188b3a19ee1e Reviewed-on: https://code.wireshark.org/review/18727 Reviewed-by: Peter Wu Reviewed-by: Dario Lombardo Tested-by: Dario Lombardo --- CPackConfig.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'CPackConfig.txt') diff --git a/CPackConfig.txt b/CPackConfig.txt index 2df36f6c86..9cbefd062b 100644 --- a/CPackConfig.txt +++ b/CPackConfig.txt @@ -71,8 +71,14 @@ else() # 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") + if(NOT CMAKE_VERSION VERSION_LESS "3.1.0") + # TXZ generator supported since CMake 3.1.0 + set(CPACK_GENERATOR "TXZ") + set(CPACK_SOURCE_GENERATOR "TXZ") + else() + set(CPACK_GENERATOR "TBZ2") + set(CPACK_SOURCE_GENERATOR "TBZ2") + endif() endif() #=============================================== -- cgit v1.2.1