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

ENH: Always do tar.Z since we do have compress now builtin

This commit is contained in:
Andy Cedilnik 2006-08-24 10:57:27 -04:00
parent 93163cc1f9
commit 3ef750a42c
2 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Tests/SimpleInstall/CMakeLists.txt
View File

@ -213,32 +213,32 @@ IF(WIN32 AND NOT UNIX)
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)
FIND_PROGRAM(file_command NAMES file) # FIND_PROGRAM(file_command NAMES file)
IF(NOT file_command) # IF(NOT file_command)
set(file_command file) # set(file_command file)
ENDIF(NOT file_command) # ENDIF(NOT file_command)
EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress} # EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress}
OUTPUT_VARIABLE output) # OUTPUT_VARIABLE output)
set(SKIP_TZ FALSE) # set(SKIP_TZ FALSE)
if("${output}" MATCHES "script") # if("${output}" MATCHES "script")
set(SKIP_TZ TRUE) # set(SKIP_TZ TRUE)
endif("${output}" MATCHES "script") # endif("${output}" MATCHES "script")
if("${output}" MATCHES "dummy.sh") # if("${output}" MATCHES "dummy.sh")
set(SKIP_TZ TRUE) # set(SKIP_TZ TRUE)
endif("${output}" MATCHES "dummy.sh") # endif("${output}" MATCHES "dummy.sh")
if(NOT SKIP_TZ) # if(NOT SKIP_TZ)
message("compress found and it was not a script") # message("compress found and it was not a script")
message("output from file command: [${output}]") # message("output from file command: [${output}]")
SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") # SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ")
else(NOT SKIP_TZ) # else(NOT SKIP_TZ)
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}]") # message("output from file command: [${output}]")
endif(NOT SKIP_TZ) # endif(NOT SKIP_TZ)
ENDIF(found_compress) # ENDIF(found_compress)
FIND_PROGRAM(found_bz2 FIND_PROGRAM(found_bz2
NAMES bzip2) NAMES bzip2)
IF(found_bz2) IF(found_bz2)

52
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -213,32 +213,32 @@ IF(WIN32 AND NOT UNIX)
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)
FIND_PROGRAM(file_command NAMES file) # FIND_PROGRAM(file_command NAMES file)
IF(NOT file_command) # IF(NOT file_command)
set(file_command file) # set(file_command file)
ENDIF(NOT file_command) # ENDIF(NOT file_command)
EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress} # EXECUTE_PROCESS(COMMAND ${file_command} ${found_compress}
OUTPUT_VARIABLE output) # OUTPUT_VARIABLE output)
set(SKIP_TZ FALSE) # set(SKIP_TZ FALSE)
if("${output}" MATCHES "script") # if("${output}" MATCHES "script")
set(SKIP_TZ TRUE) # set(SKIP_TZ TRUE)
endif("${output}" MATCHES "script") # endif("${output}" MATCHES "script")
if("${output}" MATCHES "dummy.sh") # if("${output}" MATCHES "dummy.sh")
set(SKIP_TZ TRUE) # set(SKIP_TZ TRUE)
endif("${output}" MATCHES "dummy.sh") # endif("${output}" MATCHES "dummy.sh")
if(NOT SKIP_TZ) # if(NOT SKIP_TZ)
message("compress found and it was not a script") # message("compress found and it was not a script")
message("output from file command: [${output}]") # message("output from file command: [${output}]")
SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ") # SET(CPACK_GENERATOR "${CPACK_GENERATOR};TZ")
else(NOT SKIP_TZ) # else(NOT SKIP_TZ)
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}]") # message("output from file command: [${output}]")
endif(NOT SKIP_TZ) # endif(NOT SKIP_TZ)
ENDIF(found_compress) # ENDIF(found_compress)
FIND_PROGRAM(found_bz2 FIND_PROGRAM(found_bz2
NAMES bzip2) NAMES bzip2)
IF(found_bz2) IF(found_bz2)