diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-08-24 14:57:27 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-08-24 14:57:27 (GMT) |
| commit | 3ef750a42c8423ba5389175c6e000779d08b135e (patch) | |
| tree | f46b288eee91df45182500b73b194712570cbb92 | |
| parent | 93163cc1f93504976f4767480fb7d203217b0757 (diff) | |
| download | CMake-3ef750a42c8423ba5389175c6e000779d08b135e.zip CMake-3ef750a42c8423ba5389175c6e000779d08b135e.tar.gz CMake-3ef750a42c8423ba5389175c6e000779d08b135e.tar.bz2 | |
ENH: Always do tar.Z since we do have compress now builtin
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 52 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 52 |
2 files changed, 52 insertions, 52 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index b3262bb..4559f08 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -213,32 +213,32 @@ 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) - FIND_PROGRAM(file_command NAMES file) - IF(NOT file_command) - set(file_command file) - ENDIF(NOT file_command) - EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress} - OUTPUT_VARIABLE output) - set(SKIP_TZ FALSE) - if("${output}" MATCHES "script") - set(SKIP_TZ TRUE) - endif("${output}" MATCHES "script") - if("${output}" MATCHES "dummy.sh") - set(SKIP_TZ TRUE) - endif("${output}" MATCHES "dummy.sh") - if(NOT SKIP_TZ) - message("compress found and it was not a script") - message("output from file command: [${output}]") - SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") - else(NOT SKIP_TZ) - message("compress found, but it was a script so dont use it") - message("output from file command: [${output}]") - endif(NOT SKIP_TZ) - ENDIF(found_compress) + # SET(CPACK_GENERATOR "TGZ;STGZ") + # FIND_PROGRAM(found_compress + # NAMES compress) + # IF(found_compress) + # FIND_PROGRAM(file_command NAMES file) + # IF(NOT file_command) + # set(file_command file) + # ENDIF(NOT file_command) + # EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress} + # OUTPUT_VARIABLE output) + # set(SKIP_TZ FALSE) + # if("${output}" MATCHES "script") + # set(SKIP_TZ TRUE) + # endif("${output}" MATCHES "script") + # if("${output}" MATCHES "dummy.sh") + # set(SKIP_TZ TRUE) + # endif("${output}" MATCHES "dummy.sh") + # if(NOT SKIP_TZ) + # message("compress found and it was not a script") + # message("output from file command: [${output}]") + # SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") + # else(NOT SKIP_TZ) + # message("compress found, but it was a script so dont use it") + # message("output from file command: [${output}]") + # endif(NOT SKIP_TZ) + # ENDIF(found_compress) FIND_PROGRAM(found_bz2 NAMES bzip2) IF(found_bz2) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index b3262bb..4559f08 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -213,32 +213,32 @@ 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) - FIND_PROGRAM(file_command NAMES file) - IF(NOT file_command) - set(file_command file) - ENDIF(NOT file_command) - EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress} - OUTPUT_VARIABLE output) - set(SKIP_TZ FALSE) - if("${output}" MATCHES "script") - set(SKIP_TZ TRUE) - endif("${output}" MATCHES "script") - if("${output}" MATCHES "dummy.sh") - set(SKIP_TZ TRUE) - endif("${output}" MATCHES "dummy.sh") - if(NOT SKIP_TZ) - message("compress found and it was not a script") - message("output from file command: [${output}]") - SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") - else(NOT SKIP_TZ) - message("compress found, but it was a script so dont use it") - message("output from file command: [${output}]") - endif(NOT SKIP_TZ) - ENDIF(found_compress) + # SET(CPACK_GENERATOR "TGZ;STGZ") + # FIND_PROGRAM(found_compress + # NAMES compress) + # IF(found_compress) + # FIND_PROGRAM(file_command NAMES file) + # IF(NOT file_command) + # set(file_command file) + # ENDIF(NOT file_command) + # EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress} + # OUTPUT_VARIABLE output) + # set(SKIP_TZ FALSE) + # if("${output}" MATCHES "script") + # set(SKIP_TZ TRUE) + # endif("${output}" MATCHES "script") + # if("${output}" MATCHES "dummy.sh") + # set(SKIP_TZ TRUE) + # endif("${output}" MATCHES "dummy.sh") + # if(NOT SKIP_TZ) + # message("compress found and it was not a script") + # message("output from file command: [${output}]") + # SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") + # else(NOT SKIP_TZ) + # message("compress found, but it was a script so dont use it") + # message("output from file command: [${output}]") + # endif(NOT SKIP_TZ) + # ENDIF(found_compress) FIND_PROGRAM(found_bz2 NAMES bzip2) IF(found_bz2) |