diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-30 17:10:56 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-30 17:10:56 (GMT) |
| commit | fb51d98562a26b6dcde7d3597938a0b707b6b881 (patch) | |
| tree | b42fbfb6b27b7a9e2d5068601f61d80e7033dc79 /Tests | |
| parent | 0615218bdf3e240e44e539f9eed6c1cf9fbff2d4 (diff) | |
| download | CMake-fb51d98562a26b6dcde7d3597938a0b707b6b881.zip CMake-fb51d98562a26b6dcde7d3597938a0b707b6b881.tar.gz CMake-fb51d98562a26b6dcde7d3597938a0b707b6b881.tar.bz2 | |
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.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Complex/Executable/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 7 |
3 files changed, 15 insertions, 6 deletions
diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index 9e86320..98b29bb 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -18,7 +18,10 @@ IF(COMPLEX_TEST_CMAKELIB) IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl) ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) - LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar) + LINK_DIRECTORIES( + ${Complex_BINARY_DIR}/../../Utilities/cmlibarchive/libarchive + ${Complex_BINARY_DIR}/../../Utilities/cmbzip2 + ) ENDIF(COMPLEX_TEST_CMAKELIB) # Create an imported target for if(TARGET) test below. @@ -51,7 +54,7 @@ ADD_EXECUTABLE(complex complex testcflags.c ) # Sub1/NameConflictTest.c Sub2/NameConflictTest.c) ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx) IF(COMPLEX_TEST_CMAKELIB) - TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar cmcurl) + TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmlibarchive cmbzip2 cmcurl) ENDIF(COMPLEX_TEST_CMAKELIB) IF (UNIX) diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index 9e86320..98b29bb 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -18,7 +18,10 @@ IF(COMPLEX_TEST_CMAKELIB) IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl) ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) - LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar) + LINK_DIRECTORIES( + ${Complex_BINARY_DIR}/../../Utilities/cmlibarchive/libarchive + ${Complex_BINARY_DIR}/../../Utilities/cmbzip2 + ) ENDIF(COMPLEX_TEST_CMAKELIB) # Create an imported target for if(TARGET) test below. @@ -51,7 +54,7 @@ ADD_EXECUTABLE(complex complex testcflags.c ) # Sub1/NameConflictTest.c Sub2/NameConflictTest.c) ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx) IF(COMPLEX_TEST_CMAKELIB) - TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar cmcurl) + TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmlibarchive cmbzip2 cmcurl) ENDIF(COMPLEX_TEST_CMAKELIB) IF (UNIX) diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index 9e86320..98b29bb 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -18,7 +18,10 @@ IF(COMPLEX_TEST_CMAKELIB) IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl) ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl) - LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar) + LINK_DIRECTORIES( + ${Complex_BINARY_DIR}/../../Utilities/cmlibarchive/libarchive + ${Complex_BINARY_DIR}/../../Utilities/cmbzip2 + ) ENDIF(COMPLEX_TEST_CMAKELIB) # Create an imported target for if(TARGET) test below. @@ -51,7 +54,7 @@ ADD_EXECUTABLE(complex complex testcflags.c ) # Sub1/NameConflictTest.c Sub2/NameConflictTest.c) ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx) IF(COMPLEX_TEST_CMAKELIB) - TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar cmcurl) + TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmlibarchive cmbzip2 cmcurl) ENDIF(COMPLEX_TEST_CMAKELIB) IF (UNIX) |