[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.23.2.1 1.23.2.2 config.h.in 1.3 1.3.14.1 mprintf.c 1.5 1.5.14.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jan 28 16:48:21 EST 2010
Update of /cvsroot/CMake/CMake/Utilities/cmcurl
In directory public:/mounts/ram/cvs-serv23913/Utilities/cmcurl
Modified Files:
Tag: CMake-2-8
CMakeLists.txt config.h.in mprintf.c
Log Message:
CMake 2.8.1-rc1
Index: mprintf.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/mprintf.c,v
retrieving revision 1.5
retrieving revision 1.5.14.1
diff -C 2 -d -r1.5 -r1.5.14.1
*** mprintf.c 15 Mar 2007 19:22:13 -0000 1.5
--- mprintf.c 28 Jan 2010 21:48:19 -0000 1.5.14.1
***************
*** 45,52 ****
#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 */
--- 45,48 ----
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/CMakeLists.txt,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -C 2 -d -r1.23.2.1 -r1.23.2.2
*** CMakeLists.txt 1 Oct 2009 21:21:27 -0000 1.23.2.1
--- CMakeLists.txt 28 Jan 2010 21:48:19 -0000 1.23.2.2
***************
*** 3,10 ****
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
PROJECT(LIBCURL C)
- INCLUDE_REGULAR_EXPRESSION("^.*$")
-
# Setup package meta-data
SET(PACKAGE "curl")
--- 3,11 ----
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)
# Setup package meta-data
SET(PACKAGE "curl")
***************
*** 39,49 ****
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)
INCLUDE (CheckTypeSize)
! ENDIF(CMAKE_CROSSCOMPILING)
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
***************
*** 247,250 ****
--- 247,256 ----
# 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)
***************
*** 331,344 ****
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)
--- 337,341 ----
***************
*** 727,730 ****
--- 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)
***************
*** 735,739 ****
IF(CMAKE_BUILD_CURL_SHARED)
SET_TARGET_PROPERTIES(cmcurl PROPERTIES DEFINE_SYMBOL BUILDING_LIBCURL
! RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
INSTALL_TARGETS(/bin cmcurl)
ENDIF(CMAKE_BUILD_CURL_SHARED)
--- 752,756 ----
IF(CMAKE_BUILD_CURL_SHARED)
SET_TARGET_PROPERTIES(cmcurl PROPERTIES DEFINE_SYMBOL BUILDING_LIBCURL
! RUNTIME_OUTPUT_DIRECTORY ${CMake_BIN_DIR})
INSTALL_TARGETS(/bin cmcurl)
ENDIF(CMAKE_BUILD_CURL_SHARED)
***************
*** 746,749 ****
ADD_EXECUTABLE(LIBCURL Testing/curltest.c)
TARGET_LINK_LIBRARIES(LIBCURL cmcurl ${CMAKE_DL_LIBS})
! ADD_TEST(curl "${EXECUTABLE_OUTPUT_PATH}/LIBCURL")
INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmcurl)
--- 763,766 ----
ADD_EXECUTABLE(LIBCURL Testing/curltest.c)
TARGET_LINK_LIBRARIES(LIBCURL cmcurl ${CMAKE_DL_LIBS})
! ADD_TEST(curl LIBCURL)
INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmcurl)
Index: config.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/config.h.in,v
retrieving revision 1.3
retrieving revision 1.3.14.1
diff -C 2 -d -r1.3 -r1.3.14.1
*** config.h.in 20 Mar 2007 13:51:01 -0000 1.3
--- config.h.in 28 Jan 2010 21:48:19 -0000 1.3.14.1
***************
*** 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 */
More information about the Cmake-commits
mailing list