diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-12-28 22:02:16 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-12-28 22:02:16 (GMT) |
| commit | 2fcd41323b0101b35f49b27a82e02469267989ee (patch) | |
| tree | d5bdf22f2b51f38679f4b0f25c26497a70e893e7 | |
| parent | 0ef674b906981dfffd77e4a85e9cc928020035d7 (diff) | |
| download | CMake-2fcd41323b0101b35f49b27a82e02469267989ee.zip CMake-2fcd41323b0101b35f49b27a82e02469267989ee.tar.gz CMake-2fcd41323b0101b35f49b27a82e02469267989ee.tar.bz2 | |
COMP: Fix complex test and fix bootstrap
| -rw-r--r-- | Source/cmSystemTools.cxx | 12 | ||||
| -rw-r--r-- | Tests/Complex/Executable/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 321c4b4..2377afb 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1359,12 +1359,15 @@ bool cmSystemTools::IsPathToFramework(const char* path) return false; } -#include <libtar/libtar.h> -#include <memory> // auto_ptr -#include <fcntl.h> +#if defined(CMAKE_BUILD_WITH_CMAKE) +# include <libtar/libtar.h> +# include <memory> // auto_ptr +# include <fcntl.h> +#endif bool cmSystemTools::CreateTar(const char* outFileName, const std::vector<cmStdString>& files) { +#if defined(CMAKE_BUILD_WITH_CMAKE) TAR *t; char buf[TAR_MAXPATHLEN]; char pathname[TAR_MAXPATHLEN]; @@ -1413,4 +1416,7 @@ bool cmSystemTools::CreateTar(const char* outFileName, const std::vector<cmStdSt return false; } return true; +#else + return false; +#endif } diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index 02de931..44620a0 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -18,7 +18,7 @@ LINK_LIBRARIES(${COMPLEX_LIBS}) ADD_EXECUTABLE(A A.cxx) ADD_EXECUTABLE(complex complex testcflags.c) ADD_EXECUTABLE(complex.file complex.file.cxx) -TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib) +TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar) IF (UNIX) TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS}) ELSE(UNIX) diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index 02de931..44620a0 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -18,7 +18,7 @@ LINK_LIBRARIES(${COMPLEX_LIBS}) ADD_EXECUTABLE(A A.cxx) ADD_EXECUTABLE(complex complex testcflags.c) ADD_EXECUTABLE(complex.file complex.file.cxx) -TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib) +TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar) IF (UNIX) TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS}) ELSE(UNIX) diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index 02de931..44620a0 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -18,7 +18,7 @@ LINK_LIBRARIES(${COMPLEX_LIBS}) ADD_EXECUTABLE(A A.cxx) ADD_EXECUTABLE(complex complex testcflags.c) ADD_EXECUTABLE(complex.file complex.file.cxx) -TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib) +TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar) IF (UNIX) TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS}) ELSE(UNIX) |