13 files changed, 74 insertions, 128 deletions
diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 93c7e44087..4a88c82ce9 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -7,18 +7,16 @@ set(RELEASE_SCRIPTS
   dashsun1_release.cmake      # SunOS
   destiny_release.cmake       # HPUX
   magrathea_release.cmake     # Linux
-  vogon_release.cmake         # Windows
+  dash2win64_release.cmake    # Windows
   v20n17_aix_release.cmake    # AIX 5.3
-  vogon_cygwin.cmake          # Cygwin
+#  vogon_cygwin.cmake          # Cygwin
   ferrari_sgi64_release.cmake # IRIX 64
   ferrari_sgi_release.cmake   # IRIX 64
-#  dashsgi1_release.cmake      # IRIX
-#  dashsgi1_release64.cmake    # IRIX 64
 #  r36n11_aix_release.cmake    # AIX 5.3
 #  r15n65_aix_release.cmake    # AIX 5.2
 )
 
-file(WRITE create-${CMAKE_CREATE_VERSION}.sh "#!/bin/sh")
+file(WRITE create-${CMAKE_CREATE_VERSION}.sh "#!/bin/bash")
 make_directory(${CMAKE_CURRENT_SOURCE_DIR}/logs)
 
 foreach(f ${RELEASE_SCRIPTS})
diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake
index 19fec14883..b1fd388c29 100644
--- a/Utilities/Release/dash2win64_release.cmake
+++ b/Utilities/Release/dash2win64_release.cmake
@@ -9,6 +9,7 @@ set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j8")
 set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
+CMAKE_Fortran_COMPILER:FILEPATH=FALSE
 CMAKE_GENERATOR:INTERNAL=Unix Makefiles
 BUILD_QtDialog:BOOL:=TRUE
 QT_QMAKE_EXECUTABLE:FILEPATH=c:/Dashboards/Support/qt-4.5.3-static/bin/qmake.exe
diff --git a/Utilities/Release/destiny_release.cmake b/Utilities/Release/destiny_release.cmake
index 886909faa0..06cc60132e 100644
--- a/Utilities/Release/destiny_release.cmake
+++ b/Utilities/Release/destiny_release.cmake
@@ -1,4 +1,5 @@
 set(PROCESSORS 1)
+set(CVSROOT ":pserver:anonymous@www.cmake.org:/cvsroot/CMake")
 set(RUN_SHELL "/usr/local/bin/zsh -l -c /bin/sh")
 set(CVS_COMMAND "/usr/local/bin/cvs")
 set(HOST destiny)
diff --git a/Utilities/Release/upload_release.cmake b/Utilities/Release/upload_release.cmake
index c7f99c086b..211bc3eb1c 100644
--- a/Utilities/Release/upload_release.cmake
+++ b/Utilities/Release/upload_release.cmake
@@ -1,6 +1,6 @@
 set(PROJECT_PREFIX cmake-)
 if(NOT VERSION)
- set(VERSION 2.6)
+ set(VERSION 2.8)
 endif(NOT VERSION)
 file(GLOB FILES ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_PREFIX}*")
 message("${FILES}")
diff --git a/Utilities/Release/v20n17_aix_release.cmake b/Utilities/Release/v20n17_aix_release.cmake
index b7494bb707..a16981794a 100644
--- a/Utilities/Release/v20n17_aix_release.cmake
+++ b/Utilities/Release/v20n17_aix_release.cmake
@@ -1,4 +1,5 @@
 set(CMAKE_RELEASE_DIRECTORY "/bench1/noibm34/CMakeReleaseDirectory" )
+set(CVSROOT ":pserver:anonymous@www.cmake.org:/cvsroot/CMake")
 set(FINAL_PATH /u/noibm34/cmake-release)
 set(PROCESSORS 2)
 set(CVS_COMMAND /vol/local/bin/cvs)
diff --git a/Utilities/cmcurl/CMake/CheckTypeSize.c.in b/Utilities/cmcurl/CMake/CheckTypeSize.c.in
deleted file mode 100644
index 8c9a0163e5..0000000000
--- a/Utilities/cmcurl/CMake/CheckTypeSize.c.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#cmakedefine CHECK_TYPE_SIZE_TYPE @CHECK_TYPE_SIZE_TYPE@
-#ifdef CHECK_TYPE_SIZE_TYPE
-
-@CHECK_TYPE_SIZE_PREINCLUDE@
-#ifdef HAVE_SYS_TYPES_H
-#  include <sys/types.h>
-#endif /* HAVE_SYS_TYPES_H */
-
-#ifdef HAVE_STDINT_H
-#  include <stdint.h>
-#endif /* HAVE_STDINT_H */
-
-#ifdef HAVE_STDDEF_H
-#  include <stddef.h>
-#endif /* HAVE_STDDEF_H */
-
-@CHECK_TYPE_SIZE_PREMAIN@
-
-#ifdef __CLASSIC_C__
-int main(){
-  int ac;
-  char*av[];
-#else
-int main(int ac, char*av[]){
-#endif
-  if(ac > 1000){return *av[0];}
-  return sizeof(CHECK_TYPE_SIZE_TYPE);
-}
-
-#else  /* CHECK_TYPE_SIZE_TYPE */
-
-#  error "CHECK_TYPE_SIZE_TYPE has to specify the type"
-
-#endif /* CHECK_TYPE_SIZE_TYPE */
diff --git a/Utilities/cmcurl/CMake/CheckTypeSize.cmake b/Utilities/cmcurl/CMake/CheckTypeSize.cmake
deleted file mode 100644
index e16c64dfed..0000000000
--- a/Utilities/cmcurl/CMake/CheckTypeSize.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# - Check sizeof a type
-#  CHECK_TYPE_SIZE(TYPE VARIABLE)
-# Check if the type exists and determine size of type.  if the type
-# exists, the size will be stored to the variable.
-#
-#  VARIABLE - variable to store size if the type exists.
-#  HAVE_${VARIABLE} - does the variable exists or not
-
-MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
-  SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)
-  IF(NOT DEFINED ${VARIABLE})
-  IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
-    SET(CHECK_TYPE_SIZE_TYPE "${TYPE}")
-    SET(MACRO_CHECK_TYPE_SIZE_FLAGS 
-      "${CMAKE_REQUIRED_FLAGS}")
-    FOREACH(def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H)
-      IF("${def}")
-        SET(MACRO_CHECK_TYPE_SIZE_FLAGS 
-          "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}")
-      ENDIF("${def}")
-    ENDFOREACH(def)
-    SET(CHECK_TYPE_SIZE_PREMAIN)
-    FOREACH(def ${CMAKE_EXTRA_INCLUDE_FILES})
-      SET(CHECK_TYPE_SIZE_PREMAIN "${CHECK_TYPE_SIZE_PREMAIN}#include \"${def}\"\n")
-    ENDFOREACH(def)
-    CONFIGURE_FILE(
-      "${CMAKE_CURRENT_SOURCE_DIR}/CMake/CheckTypeSize.c.in"
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c" 
-      IMMEDIATE @ONLY)
-    FILE(READ 
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c"
-      CHECK_TYPE_SIZE_FILE_CONTENT)
-    MESSAGE(STATUS "Check size of ${TYPE}")
-    IF(CMAKE_REQUIRED_LIBRARIES)
-      SET(CHECK_TYPE_SIZE_ADD_LIBRARIES 
-        "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
-    ENDIF(CMAKE_REQUIRED_LIBRARIES)
-    TRY_RUN(${VARIABLE} HAVE_${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckTypeSize.c"
-      CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS}
-      "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"
-      OUTPUT_VARIABLE OUTPUT)
-    IF(HAVE_${VARIABLE})
-      MESSAGE(STATUS "Check size of ${TYPE} - done")
-      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log 
-        "Determining size of ${TYPE} passed with the following output:\n${OUTPUT}\n\n")
-    ELSE(HAVE_${VARIABLE})
-      MESSAGE(STATUS "Check size of ${TYPE} - failed")
-      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log 
-        "Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\nCheckTypeSize.c:\n${CHECK_TYPE_SIZE_FILE_CONTENT}\n\n")
-    ENDIF(HAVE_${VARIABLE})
-  ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
-  ENDIF(NOT DEFINED ${VARIABLE})
-  SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )
-ENDMACRO(CHECK_TYPE_SIZE)
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index e2c64db5f5..d7ff9aa969 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -2,10 +2,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 IF(COMMAND CMAKE_POLICY)
   CMAKE_POLICY(SET CMP0003 NEW)
 ENDIF(COMMAND CMAKE_POLICY)
+IF(CMAKE_OSX_ARCHITECTURES)
+  CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
+ENDIF(CMAKE_OSX_ARCHITECTURES)
 PROJECT(LIBCURL C)
 
-INCLUDE_REGULAR_EXPRESSION("^.*$")
-
 # Setup package meta-data
 SET(PACKAGE "curl")
 SET(VERSION "7.16.1")
@@ -38,13 +39,12 @@ INCLUDE (CheckIncludeFile)
 INCLUDE (CheckIncludeFiles)
 INCLUDE (CheckLibraryExists)
 INCLUDE (CheckSymbolExists)
-# if crosscompiling is on, the CHECK_TYPE_SIZE macro coming with cmake uses
-# TRY_COMPILE instead of TRY_RUN which makes crosscompiling easier, Alex
-IF(CMAKE_CROSSCOMPILING)  
-  INCLUDE ("${CMAKE_ROOT}/Modules/CheckTypeSize.cmake")
-ELSE(CMAKE_CROSSCOMPILING)
+IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4
+    AND CMake_SOURCE_DIR)
+  INCLUDE (${CMake_SOURCE_DIR}/Modules/CheckTypeSize.cmake)
+ELSE()
   INCLUDE (CheckTypeSize)
-ENDIF(CMAKE_CROSSCOMPILING)
+ENDIF()
 
 SET(libCurl_SRCS
   #  amigaos.c - does not build on AmigaOS
@@ -246,6 +246,12 @@ MACRO(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE)
 ENDMACRO(CHECK_INCLUDE_FILE_CONCAT)
 
 # Check for header files
+IF(UNIX)
+  SET(HAVE_WINDOWS_H 0)
+  SET(HAVE_WINSOCK_H 0)
+  SET(HAVE_WS2TCPIP_H 0)
+  SET(HAVE_WINSOCK2_H 0)
+ENDIF(UNIX)
 IF(NOT UNIX)
   CHECK_INCLUDE_FILE_CONCAT("ws2tcpip.h"     HAVE_WS2TCPIP_H)
   CHECK_INCLUDE_FILE_CONCAT("winsock2.h"     HAVE_WINSOCK2_H)
@@ -330,16 +336,7 @@ CHECK_TYPE_SIZE(ssize_t  SIZEOF_SSIZE_T)
 CHECK_TYPE_SIZE("long long"  SIZEOF_LONG_LONG)
 CHECK_TYPE_SIZE("long"  SIZEOF_LONG)
 CHECK_TYPE_SIZE("__int64"  SIZEOF___INT64)
-CHECK_TYPE_SIZE("long double"  SIZEOF_LONG_DOUBLE)
 CHECK_TYPE_SIZE("time_t"  SIZEOF_TIME_T)
-IF(NOT HAVE_SIZEOF_SSIZE_T)
-  IF(SIZEOF_LONG EQUAL SIZEOF_SIZE_T)
-    SET(ssize_t long)
-  ENDIF(SIZEOF_LONG EQUAL SIZEOF_SIZE_T)
-  IF(NOT ssize_t AND SIZEOF___INT64 EQUAL SIZEOF_SIZE_T)
-    SET(ssize_t __int64)
-  ENDIF(NOT ssize_t AND SIZEOF___INT64 EQUAL SIZEOF_SIZE_T)
-ENDIF(NOT HAVE_SIZEOF_SSIZE_T)
 
 IF(HAVE_SIZEOF_LONG_LONG)
   SET(HAVE_LONGLONG 1)
@@ -726,6 +723,26 @@ ELSE(CMAKE_BUILD_CURL_SHARED)
     -DCURL_STATICLIB)
 ENDIF(CMAKE_BUILD_CURL_SHARED)
 SET(CURL_STATICLIB)
+
+# Support CheckTypeSize module from CMake 2.8.0 and lower.
+FOREACH(var
+    SIZEOF_CURL_OFF_T
+    SIZEOF_LONG
+    SIZEOF_LONG_LONG
+    SIZEOF___INT64
+    SIZEOF_SIZE_T
+    SIZEOF_TIME_T
+    )
+  IF(NOT ${var}_CODE)
+    MESSAGE("creating ${var}_CODE")
+    IF(${var})
+      SET(${var}_CODE "#define ${var} ${${var}}")
+    ELSE()
+      SET(${var}_CODE "/* #undef ${var} */")
+    ENDIF()
+  ENDIF()
+ENDFOREACH()
+
 CONFIGURE_FILE(${LIBCURL_SOURCE_DIR}/config.h.in
   ${LIBCURL_BINARY_DIR}/config.h)
 
@@ -734,7 +751,7 @@ ADD_LIBRARY(cmcurl ${LIBRARY_TYPE} ${libCurl_SRCS})
 TARGET_LINK_LIBRARIES(cmcurl ${CURL_LIBS})
 IF(CMAKE_BUILD_CURL_SHARED)
   SET_TARGET_PROPERTIES(cmcurl PROPERTIES DEFINE_SYMBOL BUILDING_LIBCURL
-    RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+    RUNTIME_OUTPUT_DIRECTORY ${CMake_BIN_DIR})
   INSTALL_TARGETS(/bin cmcurl)
 ENDIF(CMAKE_BUILD_CURL_SHARED)
 
@@ -745,5 +762,5 @@ ENDIF(CURL_TESTING)
 
 ADD_EXECUTABLE(LIBCURL Testing/curltest.c)
 TARGET_LINK_LIBRARIES(LIBCURL cmcurl ${CMAKE_DL_LIBS})
-ADD_TEST(curl "${EXECUTABLE_OUTPUT_PATH}/LIBCURL")
+ADD_TEST(curl LIBCURL)
 INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmcurl)
diff --git a/Utilities/cmcurl/config.h.in b/Utilities/cmcurl/config.h.in
index 6f2e5dbb17..e3efdc142d 100644
--- a/Utilities/cmcurl/config.h.in
+++ b/Utilities/cmcurl/config.h.in
@@ -640,16 +640,25 @@
 #cmakedefine SEND_TYPE_RETV ${SEND_TYPE_RETV}
 
 /* The size of `curl_off_t', as computed by sizeof. */
-#cmakedefine SIZEOF_CURL_OFF_T ${SIZEOF_CURL_OFF_T}
+@SIZEOF_CURL_OFF_T_CODE@
 
 /* The size of `long', as computed by sizeof. */
-#cmakedefine SIZEOF_LONG ${SIZEOF_LONG}
+@SIZEOF_LONG_CODE@
+
+/* The size of `long long', as computed by sizeof. */
+@SIZEOF_LONG_LONG_CODE@
+
+/* The size of `__int64', as computed by sizeof. */
+@SIZEOF___INT64_CODE@
 
 /* The size of `size_t', as computed by sizeof. */
-#cmakedefine SIZEOF_SIZE_T ${SIZEOF_SIZE_T}
+@SIZEOF_SIZE_T_CODE@
+
+/* The size of `ssize_t', as computed by sizeof. */
+@SIZEOF_SSIZE_T_CODE@
 
 /* The size of `time_t', as computed by sizeof. */
-#cmakedefine SIZEOF_TIME_T ${SIZEOF_TIME_T}
+@SIZEOF_TIME_T_CODE@
 
 /* Define to 1 if you have the ANSI C header files. */
 #cmakedefine STDC_HEADERS ${STDC_HEADERS}
@@ -713,7 +722,17 @@
 #cmakedefine socklen_t ${socklen_t}
 
 /* the signed version of size_t */
-#cmakedefine ssize_t ${ssize_t}
+#ifndef SIZEOF_SSIZE_T
+# if SIZEOF_LONG == SIZEOF_SIZE_T
+   typedef long ssize_t;
+# elif SIZEOF_LONG_LONG == SIZEOF_SIZE_T
+   typedef long long ssize_t;
+# elif SIZEOF___INT64 == SIZEOF_SIZE_T
+   typedef __int64 ssize_t;
+# else
+   typedef int ssize_t;
+# endif
+#endif
 
 /* Special handling of zlib library */
 #cmakedefine CURL_SPECIAL_ZLIB_H "${CURL_SPECIAL_ZLIB_H}"
diff --git a/Utilities/cmcurl/mprintf.c b/Utilities/cmcurl/mprintf.c
index 6103953185..8b2f3d07e6 100644
--- a/Utilities/cmcurl/mprintf.c
+++ b/Utilities/cmcurl/mprintf.c
@@ -44,10 +44,6 @@
 
 #include <curl/mprintf.h>
 
-#ifndef SIZEOF_LONG_DOUBLE
-#define SIZEOF_LONG_DOUBLE 0
-#endif
-
 #ifndef SIZEOF_SIZE_T
 /* default to 4 bytes for size_t unless defined in the config.h */
 #define SIZEOF_SIZE_T 4
diff --git a/Utilities/cmexpat/CMakeLists.txt b/Utilities/cmexpat/CMakeLists.txt
index 7dd8329f11..b75c11232c 100644
--- a/Utilities/cmexpat/CMakeLists.txt
+++ b/Utilities/cmexpat/CMakeLists.txt
@@ -1,5 +1,4 @@
 PROJECT(CMEXPAT)
-INCLUDE_REGULAR_EXPRESSION("^.*$")
 
 SET(expat_SRCS
   xmlparse.c
diff --git a/Utilities/cmzlib/CMakeLists.txt b/Utilities/cmzlib/CMakeLists.txt
index 5ee43e384d..c42a434858 100644
--- a/Utilities/cmzlib/CMakeLists.txt
+++ b/Utilities/cmzlib/CMakeLists.txt
@@ -6,9 +6,6 @@ INCLUDE_DIRECTORIES(
   "${CMZLIB_BINARY_DIR}/.."
   )
 
-# Match all headers for dependencies but complain about none.
-INCLUDE_REGULAR_EXPRESSION("^.*$")
-
 # source files for zlib
 SET(ZLIB_SRCS
   adler32.c  compress.c  crc32.c  deflate.c  gzio.c   inffast.c
diff --git a/Utilities/cmzlib/deflate.c b/Utilities/cmzlib/deflate.c
index 29ce1f64a5..a5e7a358fc 100644
--- a/Utilities/cmzlib/deflate.c
+++ b/Utilities/cmzlib/deflate.c
@@ -285,6 +285,13 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
 
     s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+
+    // The following memset eliminates the valgrind uninitialized warning
+    // "swept under the carpet" here:
+    // http://www.zlib.net/zlib_faq.html#faq36
+    //
+    memset(s->window, 0, s->w_size*2*sizeof(Byte));
+
     s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
     s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));