[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.29 1.30 config.h.in 1.3 1.4

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmcurl
In directory public:/mounts/ram/cvs-serv31962/Utilities/cmcurl

Modified Files:
	CMakeLists.txt config.h.in 
Log Message:
cmcurl: Use arch-aware CHECK_TYPE_SIZE result

Our new CHECK_TYPE_SIZE macro produces a SIZEOF_<type>_CODE value for
use in configured headers to get architecture-aware type size results.
In this commit we teach cmcurl to use the SIZEOF_<type>_CODE value to
get proper configured type sizes in OS X Universal Binaries.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/CMakeLists.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -C 2 -d -r1.29 -r1.30
*** CMakeLists.txt	17 Dec 2009 20:15:53 -0000	1.29
--- CMakeLists.txt	17 Dec 2009 20:16:13 -0000	1.30
***************
*** 3,6 ****
--- 3,9 ----
    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)
  
***************
*** 37,41 ****
  INCLUDE (CheckLibraryExists)
  INCLUDE (CheckSymbolExists)
! INCLUDE (CheckTypeSize)
  
  SET(libCurl_SRCS
--- 40,49 ----
  INCLUDE (CheckLibraryExists)
  INCLUDE (CheckSymbolExists)
! 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()
  
  SET(libCurl_SRCS
***************
*** 330,341 ****
  CHECK_TYPE_SIZE("__int64"  SIZEOF___INT64)
  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)
--- 338,341 ----
***************
*** 724,727 ****
--- 724,747 ----
  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)

Index: config.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/config.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** config.h.in	20 Mar 2007 13:51:01 -0000	1.3
--- config.h.in	17 Dec 2009 20:16:13 -0000	1.4
***************
*** 641,654 ****
  
  /* The size of `curl_off_t', as computed by sizeof. */
! #cmakedefine SIZEOF_CURL_OFF_T ${SIZEOF_CURL_OFF_T}
  
  /* The size of `long', as computed by sizeof. */
! #cmakedefine SIZEOF_LONG ${SIZEOF_LONG}
  
  /* The size of `size_t', as computed by sizeof. */
! #cmakedefine SIZEOF_SIZE_T ${SIZEOF_SIZE_T}
  
  /* The size of `time_t', as computed by sizeof. */
! #cmakedefine SIZEOF_TIME_T ${SIZEOF_TIME_T}
  
  /* Define to 1 if you have the ANSI C header files. */
--- 641,663 ----
  
  /* The size of `curl_off_t', as computed by sizeof. */
! @SIZEOF_CURL_OFF_T_CODE@
  
  /* The size of `long', as computed by sizeof. */
! @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. */
! @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. */
! @SIZEOF_TIME_T_CODE@
  
  /* Define to 1 if you have the ANSI C header files. */
***************
*** 714,718 ****
  
  /* the signed version of size_t */
! #cmakedefine ssize_t ${ssize_t}
  
  /* Special handling of zlib library */
--- 723,737 ----
  
  /* the signed version of size_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 */