Browse Source

ENH: Add test for bz2 and check for compress

Andy Cedilnik 19 years ago
parent
commit
0de464fe36
2 changed files with 28 additions and 0 deletions
  1. 14 0
      Tests/SimpleInstall/CMakeLists.txt
  2. 14 0
      Tests/SimpleInstallS2/CMakeLists.txt

+ 14 - 0
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)

+ 14 - 0
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)