diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-08-07 14:10:38 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-08-07 14:10:38 (GMT) |
| commit | bba6583942ea78ba3ce9ad3f835f025d8a8e6c71 (patch) | |
| tree | 7d16ebaa03c4bbcd1bcc0e95212fff2a6bd0a1c2 | |
| parent | 60936bab91d09b37969c27598d2f9e0ab0842ddc (diff) | |
| download | CMake-bba6583942ea78ba3ce9ad3f835f025d8a8e6c71.zip CMake-bba6583942ea78ba3ce9ad3f835f025d8a8e6c71.tar.gz CMake-bba6583942ea78ba3ce9ad3f835f025d8a8e6c71.tar.bz2 | |
ENH: finally fix the failing test on the dashboard for the past month or so
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 08a2b01..b5f53ba 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -182,7 +182,13 @@ IF(UNIX AND NOT APPLE) FIND_PROGRAM(found_compress NAMES compress) IF(found_compress) - SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") + EXECUTE_PROCESS(COMMAND file ${found_compress} OUTPUT_VARIABLE output) + if(NOT "${output}" MATCHES "script") + message("compress found and it was not a script") + SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") + else(NOT "${output}" MATCHES "script") + message("compress found, but it was a script so dont use it") + endif(NOT "${output}" MATCHES "script") ENDIF(found_compress) FIND_PROGRAM(found_bz2 NAMES bzip2) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index 08a2b01..b5f53ba 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -182,7 +182,13 @@ IF(UNIX AND NOT APPLE) FIND_PROGRAM(found_compress NAMES compress) IF(found_compress) - SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") + EXECUTE_PROCESS(COMMAND file ${found_compress} OUTPUT_VARIABLE output) + if(NOT "${output}" MATCHES "script") + message("compress found and it was not a script") + SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") + else(NOT "${output}" MATCHES "script") + message("compress found, but it was a script so dont use it") + endif(NOT "${output}" MATCHES "script") ENDIF(found_compress) FIND_PROGRAM(found_bz2 NAMES bzip2) |