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

ENH: try to fix compress failure

Browse Source
This commit is contained in:
Bill Hoffman 2006-08-09 11:32:23 -04:00
parent 8c94be3f18
commit fe3d8078c5
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tests/SimpleInstall/CMakeLists.txt
View File

@ -176,18 +176,24 @@ IF(WIN32 AND NOT UNIX)
SET(CPACK_GENERATOR TGZ) SET(CPACK_GENERATOR TGZ)
ENDIF(NOT NSIS_MAKENSIS) ENDIF(NOT NSIS_MAKENSIS)
ENDIF(WIN32 AND NOT UNIX) ENDIF(WIN32 AND NOT UNIX)
IF(UNIX AND NOT APPLE) IF(UNIX AND NOT APPLE)
SET(CPACK_GENERATOR "TGZ;STGZ") SET(CPACK_GENERATOR "TGZ;STGZ")
FIND_PROGRAM(found_compress FIND_PROGRAM(found_compress
NAMES compress) NAMES compress)
IF(found_compress) IF(found_compress)
EXECUTE_PROCESS(COMMAND file ${found_compress} OUTPUT_VARIABLE output) 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)
if(NOT "${output}" MATCHES "script") if(NOT "${output}" MATCHES "script")
message("compress found and it was not a script") message("compress found and it was not a script")
message("output from file command: [${output}]")
SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ")
else(NOT "${output}" MATCHES "script") else(NOT "${output}" MATCHES "script")
message("compress found, but it was a script so dont use it") message("compress found, but it was a script so dont use it")
message("output from file command: [${output}]")
endif(NOT "${output}" MATCHES "script") endif(NOT "${output}" MATCHES "script")
ENDIF(found_compress) ENDIF(found_compress)
FIND_PROGRAM(found_bz2 FIND_PROGRAM(found_bz2

10
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -176,18 +176,24 @@ IF(WIN32 AND NOT UNIX)
SET(CPACK_GENERATOR TGZ) SET(CPACK_GENERATOR TGZ)
ENDIF(NOT NSIS_MAKENSIS) ENDIF(NOT NSIS_MAKENSIS)
ENDIF(WIN32 AND NOT UNIX) ENDIF(WIN32 AND NOT UNIX)
IF(UNIX AND NOT APPLE) IF(UNIX AND NOT APPLE)
SET(CPACK_GENERATOR "TGZ;STGZ") SET(CPACK_GENERATOR "TGZ;STGZ")
FIND_PROGRAM(found_compress FIND_PROGRAM(found_compress
NAMES compress) NAMES compress)
IF(found_compress) IF(found_compress)
EXECUTE_PROCESS(COMMAND file ${found_compress} OUTPUT_VARIABLE output) 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)
if(NOT "${output}" MATCHES "script") if(NOT "${output}" MATCHES "script")
message("compress found and it was not a script") message("compress found and it was not a script")
message("output from file command: [${output}]")
SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ")
else(NOT "${output}" MATCHES "script") else(NOT "${output}" MATCHES "script")
message("compress found, but it was a script so dont use it") message("compress found, but it was a script so dont use it")
message("output from file command: [${output}]")
endif(NOT "${output}" MATCHES "script") endif(NOT "${output}" MATCHES "script")
ENDIF(found_compress) ENDIF(found_compress)
FIND_PROGRAM(found_bz2 FIND_PROGRAM(found_bz2