[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.69 1.71

[cmake-commits at cmake.org]

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

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/Tests/ComplexOneConfig/Executable/CMakeLists.txt,v
retrieving revision 1.69
retrieving revision 1.71
diff -C 2 -d -r1.69 -r1.71
*** CMakeLists.txt	8 Jul 2009 15:41:13 -0000	1.69
--- CMakeLists.txt	30 Oct 2009 17:08:29 -0000	1.71
***************
*** 19,23 ****
      LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
    ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl)
!   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
  ENDIF(COMPLEX_TEST_CMAKELIB)
  
--- 19,26 ----
      LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
    ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl)
!   LINK_DIRECTORIES(
!   ${Complex_BINARY_DIR}/../../Utilities/cmlibarchive/libarchive
!   ${Complex_BINARY_DIR}/../../Utilities/cmbzip2
!   )
  ENDIF(COMPLEX_TEST_CMAKELIB)
  
***************
*** 52,56 ****
  ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx)
  IF(COMPLEX_TEST_CMAKELIB)
!   TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar cmcurl)
  ENDIF(COMPLEX_TEST_CMAKELIB)
  
--- 55,59 ----
  ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx)
  IF(COMPLEX_TEST_CMAKELIB)
!   TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmlibarchive cmbzip2 cmcurl)
  ENDIF(COMPLEX_TEST_CMAKELIB)