kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: finally fix the failing test on the dashboard for the past month or so

This commit is contained in:
Bill Hoffman 2006-08-07 10:10:38 -04:00
parent 60936bab91
commit bba6583942
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tests/SimpleInstall/CMakeLists.txt
View File

@ -182,7 +182,13 @@ IF(UNIX AND NOT APPLE)
FIND_PROGRAM(found_compress FIND_PROGRAM(found_compress
NAMES compress) NAMES compress)
IF(found_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) ENDIF(found_compress)
FIND_PROGRAM(found_bz2 FIND_PROGRAM(found_bz2
NAMES bzip2) NAMES bzip2)

8
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -182,7 +182,13 @@ IF(UNIX AND NOT APPLE)
FIND_PROGRAM(found_compress FIND_PROGRAM(found_compress
NAMES compress) NAMES compress)
IF(found_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) ENDIF(found_compress)
FIND_PROGRAM(found_bz2 FIND_PROGRAM(found_bz2
NAMES bzip2) NAMES bzip2)