[cmake-commits] hoffman committed CMakeLists.txt 1.12.2.2 1.12.2.3 config.h.in 1.9.2.1 1.9.2.2 libtar.c 1.12.2.1 1.12.2.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmtar
In directory public:/mounts/ram/cvs-serv22632/Utilities/cmtar

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt config.h.in libtar.c 
Log Message:
ENH: move changes from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/CMakeLists.txt,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -d -r1.12.2.2 -r1.12.2.3
--- CMakeLists.txt	13 Oct 2006 14:52:16 -0000	1.12.2.2
+++ CMakeLists.txt	27 Oct 2006 20:01:55 -0000	1.12.2.3
@@ -62,7 +62,6 @@
 
 
 INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}")
-INCLUDE_DIRECTORIES(${CURL_SPECIAL_LIBZ_INCLUDES})
 
 #check for stdc headers
 CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
@@ -367,11 +366,18 @@
 #SET(NEED_GLOB 1)
 #ENDIF(NOT HAVE_GLOB)
 
+# Setup zlib.
+IF(NOT CMTAR_ZLIB_LIBRARIES)
+  MESSAGE(FATAL_ERROR "Parent project must set CMTAR_ZLIB_LIBRARIES.")
+ENDIF(NOT CMTAR_ZLIB_LIBRARIES)
+IF(NOT CMTAR_ZLIB_HEADER)
+  MESSAGE(FATAL_ERROR "Parent project must set CMTAR_ZLIB_HEADER.")
+ENDIF(NOT CMTAR_ZLIB_HEADER)
+INCLUDE_DIRECTORIES(${CMTAR_ZLIB_INCLUDE_DIRS})
 
 CONFIGURE_FILE(${LIBTAR_SOURCE_DIR}/config.h.in
   ${LIBTAR_BINARY_DIR}/libtar/config.h)
 
 ADD_LIBRARY(cmtar STATIC ${libtar_SRC})
 ADD_EXECUTABLE(tartest libtar.c)
-TARGET_LINK_LIBRARIES(tartest cmtar ${CMAKE_ZLIB_LIBRARIES})
-
+TARGET_LINK_LIBRARIES(tartest cmtar ${CMTAR_ZLIB_LIBRARIES})

Index: libtar.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/libtar.c,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- libtar.c	24 Jul 2006 15:19:37 -0000	1.12.2.1
+++ libtar.c	27 Oct 2006 20:01:55 -0000	1.12.2.2
@@ -35,18 +35,7 @@
 # include <signal.h>
 #endif
 
-#ifdef HAVE_LIBZ
-#ifdef HAVE_VTK_LIBZ
-# include <vtkzlib/zlib.h>
-# define cm_zlib_gzdopen gzdopen
-# define cm_zlib_gzclose gzclose
-# define cm_zlib_gzread gzread
-# define cm_zlib_gzwrite gzwrite
-
-#else
-# include <cmzlib/zlib.h>
-#endif
-#endif
+#include CMTAR_ZLIB_HEADER
 
 #include <libtar/compat.h>
 
@@ -117,7 +106,7 @@
     }
 #endif
 
-  gzf->GZFile = cm_zlib_gzdopen(fd, gzoflags);
+  gzf->GZFile = gzdopen(fd, gzoflags);
   if (!gzf->GZFile)
   {
     errno = ENOMEM;
@@ -130,19 +119,19 @@
 static int libtar_gzclose(void* call_data)
 {
   struct gzStruct* gzf = (struct gzStruct*)call_data;
-  return cm_zlib_gzclose(gzf->GZFile);
+  return gzclose(gzf->GZFile);
 }
 
 static ssize_t libtar_gzread(void* call_data, void* buf, size_t count)
 {
   struct gzStruct* gzf = (struct gzStruct*)call_data;
-  return cm_zlib_gzread(gzf->GZFile, buf, count);
+  return gzread(gzf->GZFile, buf, count);
 }
 
 static ssize_t libtar_gzwrite(void* call_data, const void* buf, size_t count)
 {
   struct gzStruct* gzf = (struct gzStruct*)call_data;
-  return cm_zlib_gzwrite(gzf->GZFile, (void*)buf, count);
+  return gzwrite(gzf->GZFile, (void*)buf, count);
 }
 
 tartype_t gztype = { 

Index: config.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/config.h.in,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -d -r1.9.2.1 -r1.9.2.2
--- config.h.in	30 Jun 2006 17:48:48 -0000	1.9.2.1
+++ config.h.in	27 Oct 2006 20:01:55 -0000	1.9.2.2
@@ -42,9 +42,6 @@
 /* Define to 1 if you have the `z' library (-lz). */
 #cmakedefine HAVE_LIBZ @HAVE_LIBZ@
 
-/* Define to 1 if you have the VTK's `z' library */
-#cmakedefine HAVE_VTK_LIBZ @HAVE_VTK_LIBZ@
-
 /* Define to 1 if the system has the type `major_t'. */
 #cmakedefine HAVE_MAJOR_T @HAVE_MAJOR_T@
 
@@ -209,3 +206,5 @@
 
 /* Define to `long long' if not defined in system header files. */
 #cmakedefine uint64_t @uint64_t@
+
+#define CMTAR_ZLIB_HEADER "@CMTAR_ZLIB_HEADER@"