Commit 2fcd4132 authored by Andy Cedilnik's avatar Andy Cedilnik
Browse files

COMP: Fix complex test and fix bootstrap

parent 0ef674b9
...@@ -1359,12 +1359,15 @@ bool cmSystemTools::IsPathToFramework(const char* path) ...@@ -1359,12 +1359,15 @@ bool cmSystemTools::IsPathToFramework(const char* path)
return false; return false;
} }
#include <libtar/libtar.h> #if defined(CMAKE_BUILD_WITH_CMAKE)
#include <memory> // auto_ptr # include <libtar/libtar.h>
#include <fcntl.h> # include <memory> // auto_ptr
# include <fcntl.h>
#endif
bool cmSystemTools::CreateTar(const char* outFileName, const std::vector<cmStdString>& files) bool cmSystemTools::CreateTar(const char* outFileName, const std::vector<cmStdString>& files)
{ {
#if defined(CMAKE_BUILD_WITH_CMAKE)
TAR *t; TAR *t;
char buf[TAR_MAXPATHLEN]; char buf[TAR_MAXPATHLEN];
char pathname[TAR_MAXPATHLEN]; char pathname[TAR_MAXPATHLEN];
...@@ -1413,4 +1416,7 @@ bool cmSystemTools::CreateTar(const char* outFileName, const std::vector<cmStdSt ...@@ -1413,4 +1416,7 @@ bool cmSystemTools::CreateTar(const char* outFileName, const std::vector<cmStdSt
return false; return false;
} }
return true; return true;
#else
return false;
#endif
} }
...@@ -18,7 +18,7 @@ LINK_LIBRARIES(${COMPLEX_LIBS}) ...@@ -18,7 +18,7 @@ LINK_LIBRARIES(${COMPLEX_LIBS})
ADD_EXECUTABLE(A A.cxx) ADD_EXECUTABLE(A A.cxx)
ADD_EXECUTABLE(complex complex testcflags.c) ADD_EXECUTABLE(complex complex testcflags.c)
ADD_EXECUTABLE(complex.file complex.file.cxx) 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) IF (UNIX)
TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS}) TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS})
ELSE(UNIX) ELSE(UNIX)
......
...@@ -18,7 +18,7 @@ LINK_LIBRARIES(${COMPLEX_LIBS}) ...@@ -18,7 +18,7 @@ LINK_LIBRARIES(${COMPLEX_LIBS})
ADD_EXECUTABLE(A A.cxx) ADD_EXECUTABLE(A A.cxx)
ADD_EXECUTABLE(complex complex testcflags.c) ADD_EXECUTABLE(complex complex testcflags.c)
ADD_EXECUTABLE(complex.file complex.file.cxx) 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) IF (UNIX)
TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS}) TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS})
ELSE(UNIX) ELSE(UNIX)
......
...@@ -18,7 +18,7 @@ LINK_LIBRARIES(${COMPLEX_LIBS}) ...@@ -18,7 +18,7 @@ LINK_LIBRARIES(${COMPLEX_LIBS})
ADD_EXECUTABLE(A A.cxx) ADD_EXECUTABLE(A A.cxx)
ADD_EXECUTABLE(complex complex testcflags.c) ADD_EXECUTABLE(complex complex testcflags.c)
ADD_EXECUTABLE(complex.file complex.file.cxx) 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) IF (UNIX)
TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS}) TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS})
ELSE(UNIX) ELSE(UNIX)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment