diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-05-23 13:45:54 +0200 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-05-23 13:45:54 +0200 |
| commit | 8cf0c79d018669b9b424d543dbf901a3124a8b2f (patch) | |
| tree | 36a77397334e087f523c1e8a411d805257d62883 | |
| parent | 1a20b9d154051db97fe1bb72dba6e521db670d32 (diff) | |
Switch to gzip, so xHire is happy that it will work on windows too.
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | cmake/FindBZIP2.cmake | 12 | ||||
| -rw-r--r-- | cmake/FindGZIP.cmake | 14 |
3 files changed, 18 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cca4ad5..f2ac727 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,7 +194,7 @@ ADD_SUBDIRECTORY ( src ) ############################################################################### ADD_SUBDIRECTORY ( data ) # install the doc data compressed -FIND_PACKAGE ( BZIP2 REQUIRED ) +FIND_PACKAGE ( GZIP REQUIRED ) SET ( tuxanci_docs ${CMAKE_CURRENT_SOURCE_DIR}/LICENCE ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS @@ -202,12 +202,12 @@ SET ( tuxanci_docs ) FOREACH ( doc ${tuxanci_docs} ) GET_FILENAME_COMPONENT( _doc ${doc} NAME_WE ) - ADD_CUSTOM_COMMAND ( OUTPUT ${_doc}.bz2 - COMMAND ${BZIP2_TOOL} -c ${doc} > ${_doc}.bz2 + ADD_CUSTOM_COMMAND ( OUTPUT ${_doc}.gz + COMMAND ${GZIP_TOOL} -c ${doc} > ${_doc}.gz WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" DEPENDS ${doc} ) - INSTALL ( FILES ${CMAKE_BINARY_DIR}/${_doc}.bz2 + INSTALL ( FILES ${CMAKE_BINARY_DIR}/${_doc}.gz DESTINATION ${CMAKE_INSTALL_DOCDIR}/ ) LIST(APPEND _docFiles ${_doc}.bz2 ) ENDFOREACH ( doc ) diff --git a/cmake/FindBZIP2.cmake b/cmake/FindBZIP2.cmake deleted file mode 100644 index 6b26aa1..0000000 --- a/cmake/FindBZIP2.cmake +++ /dev/null @@ -1,12 +0,0 @@ -# This scripts search up bzip2 binary and put it to the -# BZIP2_TOOL varable. -FIND_PROGRAM(BZIP2_TOOL - NAMES bzip2 - PATHS - /bin - /usr/bin - /usr/local/bin -) -IF(NOT BZIP2_TOOL) - MESSAGE(FATAL_ERROR "Unable to find 'bzip2' executable") -ENDIF(NOT BZIP2_TOOL) diff --git a/cmake/FindGZIP.cmake b/cmake/FindGZIP.cmake new file mode 100644 index 0000000..ca15d5a --- /dev/null +++ b/cmake/FindGZIP.cmake @@ -0,0 +1,14 @@ +# This scripts search up bzip2 binary and put it to the +# GZIP_TOOL varable. +FIND_PROGRAM(GZIP_TOOL + NAMES gzip + PATHS + /bin + /usr/bin + /usr/local/bin +) +IF(NOT GZIP_TOOL) + IF(GZIP_REQUIRED) + MESSAGE(FATAL_ERROR "Unable to find 'gzip' executable") + ENDIF(GZIP_REQUIRED) +ENDIF(NOT GZIP_TOOL) |