[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.11 1.12

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmlibarchive
In directory public:/mounts/ram/cvs-serv6031/Utilities/cmlibarchive

Modified Files:
	CMakeLists.txt 
Log Message:
keep libarchive from using a system zlib unless cmake uses one


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** CMakeLists.txt	9 Nov 2009 18:38:29 -0000	1.11
--- CMakeLists.txt	9 Nov 2009 19:42:23 -0000	1.12
***************
*** 144,148 ****
    SET(HAVE_ZLIB_H 1)
    INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
!   LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
  ENDIF(ZLIB_FOUND)
  MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR)
--- 144,152 ----
    SET(HAVE_ZLIB_H 1)
    INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
!   # if building inside cmake do not add this lib
!   # as it will not exist at try compile time
!   IF(NOT "${ZLIB_LIBRARIES}" MATCHES cmzlib)
!     LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
!   ENDIF(NOT "${ZLIB_LIBRARIES}" MATCHES cmzlib)
  ENDIF(ZLIB_FOUND)
  MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR)
***************
*** 158,162 ****
    # if building inside cmake do not add this lib
    # as it will not exist at try compile time
!   IF(NOT BUILD_ARCHIVE_WITHIN_CMAKE)
      LIST(APPEND ADDITIONAL_LIBS ${BZIP2_LIBRARIES})
    ENDIF()
--- 162,166 ----
    # if building inside cmake do not add this lib
    # as it will not exist at try compile time
!   IF(NOT "${BZIP2_LIBRARIES}" MATCHES cmbzip2)
      LIST(APPEND ADDITIONAL_LIBS ${BZIP2_LIBRARIES})
    ENDIF()