From 0de464fe36ad0c42d4a51e76a7253f994d4f7b08 Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Fri, 28 Jul 2006 09:22:34 -0400 Subject: [PATCH] ENH: Add test for bz2 and check for compress --- Tests/SimpleInstall/CMakeLists.txt | 14 ++++++++++++++ Tests/SimpleInstallS2/CMakeLists.txt | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index c2de5b1c6c..08a2b01b60 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -177,6 +177,20 @@ IF(WIN32 AND NOT UNIX) ENDIF(NOT NSIS_MAKENSIS) ENDIF(WIN32 AND NOT UNIX) +IF(UNIX AND NOT APPLE) + SET(CPACK_GENERATOR "TGZ;STGZ") + FIND_PROGRAM(found_compress + NAMES compress) + IF(found_compress) + SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") + ENDIF(found_compress) + FIND_PROGRAM(found_bz2 + NAMES bzip2) + IF(found_bz2) + SET(CPACK_GENERATOR "${CPACK_GENERATOR};TBZ2") + ENDIF(found_bz2) +ENDIF(UNIX AND NOT APPLE) + SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install") SET(CMAKE_INSTALL_MFC_LIBRARIES 1) INCLUDE(InstallRequiredSystemLibraries) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index c2de5b1c6c..08a2b01b60 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -177,6 +177,20 @@ IF(WIN32 AND NOT UNIX) ENDIF(NOT NSIS_MAKENSIS) ENDIF(WIN32 AND NOT UNIX) +IF(UNIX AND NOT APPLE) + SET(CPACK_GENERATOR "TGZ;STGZ") + FIND_PROGRAM(found_compress + NAMES compress) + IF(found_compress) + SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") + ENDIF(found_compress) + FIND_PROGRAM(found_bz2 + NAMES bzip2) + IF(found_bz2) + SET(CPACK_GENERATOR "${CPACK_GENERATOR};TBZ2") + ENDIF(found_bz2) +ENDIF(UNIX AND NOT APPLE) + SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install") SET(CMAKE_INSTALL_MFC_LIBRARIES 1) INCLUDE(InstallRequiredSystemLibraries)