From 2fcd41323b0101b35f49b27a82e02469267989ee Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Wed, 28 Dec 2005 17:02:16 -0500
Subject: COMP: Fix complex test and fix bootstrap

---
 Source/cmSystemTools.cxx                             | 12 +++++++++---
 Tests/Complex/Executable/CMakeLists.txt              |  2 +-
 Tests/ComplexOneConfig/Executable/CMakeLists.txt     |  2 +-
 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)
-- 
cgit v0.12