[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.164 1.165

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv26614

Modified Files:
	CMakeLists.txt 
Log Message:
Switch to using libarchive from libtar for cpack and cmake -E tar

This allows for a built in bzip and zip capability, so external tools 
will not be needed for these packagers.  The cmake -E tar xf should be
able to handle all compression types now as well.



Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.164
retrieving revision 1.165
diff -C 2 -d -r1.164 -r1.165
*** CMakeLists.txt	20 Oct 2009 18:31:10 -0000	1.164
--- CMakeLists.txt	30 Oct 2009 17:08:20 -0000	1.165
***************
*** 67,75 ****
      ${CMAKE_USE_SYSTEM_LIBRARIES} "NOT CMAKE_USE_SYSTEM_CURL" ON)
  
-   # There is currently no option for system tar because the upstream
-   # libtar does not have our modifications to allow reentrant
-   # object-oriented use of the library.
-   # OPTION(CMAKE_USE_SYSTEM_TAR    "Use system-installed tar"   OFF)
- 
    # Mention to the user what system libraries are being used.
    FOREACH(util CURL EXPAT XMLRPC ZLIB)
--- 67,70 ----
***************
*** 240,252 ****
  
    #---------------------------------------------------------------------
-   # Build Tar library for CTest.
-   SET(CMTAR_ZLIB_HEADER ${CMAKE_ZLIB_HEADER})
-   SET(CMTAR_ZLIB_LIBRARIES ${CMAKE_ZLIB_LIBRARIES})
-   SET(CMTAR_ZLIB_INCLUDE_DIRS ${CMAKE_ZLIB_INCLUDES})
-   SET(CMAKE_TAR_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmtar)
-   SET(CMAKE_TAR_LIBRARIES cmtar)
-   SUBDIRS(Utilities/cmtar)
-   
-   #---------------------------------------------------------------------
    # Build Compress library for CTest.
    SET(CMAKE_COMPRESS_INCLUDES 
--- 235,238 ----
***************
*** 254,258 ****
    SET(CMAKE_COMPRESS_LIBRARIES "cmcompress")
    SUBDIRS(Utilities/cmcompress)
!   
    #---------------------------------------------------------------------
    # Build expat library for CMake and CTest.
--- 240,263 ----
    SET(CMAKE_COMPRESS_LIBRARIES "cmcompress")
    SUBDIRS(Utilities/cmcompress)
!   IF(CMAKE_USE_SYSTEM_BZIP2)
!     FIND_PACKAGE(BZip2)
!   ELSE()
!     SET(BZIP2_INCLUDE_DIR 
!       "${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmbzip2")
!     SET(BZIP2_LIBRARIES cmbzip2)
!     SUBDIRS(Utilities/cmbzip2)
!   ENDIF()
!   IF(CMAKE_USE_SYSTEM_LIBARCHIVE)
!     FIND_PACKAGE(libarchive)
!     SET(CMAKE_TAR_LIBRARIES libarchive)
!   ELSE(CMAKE_USE_SYSTEM_LIBARCHIVE)
!     SET(HAVE_LIBZ 1)
!     SET(HAVE_ZLIB_H 1)
!     SET(BUILD_ARCHIVE_WITHIN_CMAKE TRUE)
!     ADD_DEFINITIONS(-DLIBARCHIVE_STATIC)
!     SUBDIRS(Utilities/cmlibarchive)
!     SET(CMAKE_TAR_LIBRARIES cmlibarchive ${BZIP2_LIBRARIES})
!   ENDIF(CMAKE_USE_SYSTEM_LIBARCHIVE)
! 
    #---------------------------------------------------------------------
    # Build expat library for CMake and CTest.