COMP: Fix complex test and fix bootstrap

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
 }

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)

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)

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)