[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.9 1.10

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmlibarchive
In directory public:/mounts/ram/cvs-serv13674/Utilities/cmlibarchive

Modified Files:
	CMakeLists.txt 
Log Message:
libarchive: Fix try-compile for SIZE_MAX

This constant may be defined in one of a few headers.  We teach the
try-compile for it to test all the headers together instead of only one
header.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/CMakeLists.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** CMakeLists.txt	5 Nov 2009 21:29:21 -0000	1.9
--- CMakeLists.txt	5 Nov 2009 21:29:29 -0000	1.10
***************
*** 417,420 ****
--- 417,427 ----
  # Check defines
  #
+ SET(headers "limits.h")
+ IF(HAVE_STDINT_H)
+   LIST(APPEND headers "stdint.h")
+ ENDIF(HAVE_STDINT_H)
+ IF(HAVE_INTTYPES_H)
+   LIST(APPEND headers "inttypes.h")
+ ENDIF(HAVE_INTTYPES_H)
  CHECK_SYMBOL_EXISTS(EFTYPE           "errno.h"    HAVE_EFTYPE)
  CHECK_SYMBOL_EXISTS(EILSEQ           "errno.h"    HAVE_EILSEQ)
***************
*** 422,446 ****
  CHECK_SYMBOL_EXISTS(optarg           "unistd.h"   HAVE_DECL_OPTARG)
  CHECK_SYMBOL_EXISTS(optind           "unistd.h"   HAVE_DECL_OPTIND)
! IF(HAVE_STDINT_H)
!   CHECK_SYMBOL_EXISTS(INT64_MAX      "stdint.h"   HAVE_DECL_INT64_MAX)
!   CHECK_SYMBOL_EXISTS(INT64_MIN      "stdint.h"   HAVE_DECL_INT64_MIN)
!   CHECK_SYMBOL_EXISTS(UINT32_MAX     "stdint.h"   HAVE_DECL_UINT32_MAX)
!   CHECK_SYMBOL_EXISTS(UINT64_MAX     "stdint.h"   HAVE_DECL_UINT64_MAX)
!   CHECK_SYMBOL_EXISTS(SIZE_MAX       "stdint.h"   HAVE_DECL_SIZE_MAX)
! ELSE(HAVE_STDINT_H)
!   IF(HAVE_INTTYPES_H)
!     CHECK_SYMBOL_EXISTS(INT64_MAX      "inttypes.h"   HAVE_DECL_INT64_MAX)
!     CHECK_SYMBOL_EXISTS(INT64_MIN      "inttypes.h"   HAVE_DECL_INT64_MIN)
!     CHECK_SYMBOL_EXISTS(UINT32_MAX     "inttypes.h"   HAVE_DECL_UINT32_MAX)
!     CHECK_SYMBOL_EXISTS(UINT64_MAX     "inttypes.h"   HAVE_DECL_UINT64_MAX)
!     CHECK_SYMBOL_EXISTS(SIZE_MAX       "inttypes.h"   HAVE_DECL_SIZE_MAX)
!   ELSE(HAVE_INTTYPES_H)
!     CHECK_SYMBOL_EXISTS(INT64_MAX      "limits.h"   HAVE_DECL_INT64_MAX)
!     CHECK_SYMBOL_EXISTS(INT64_MIN      "limits.h"   HAVE_DECL_INT64_MIN)
!     CHECK_SYMBOL_EXISTS(UINT32_MAX     "limits.h"   HAVE_DECL_UINT32_MAX)
!     CHECK_SYMBOL_EXISTS(UINT64_MAX     "limits.h"   HAVE_DECL_UINT64_MAX)
!     CHECK_SYMBOL_EXISTS(SIZE_MAX       "limits.h"   HAVE_DECL_SIZE_MAX)
!   ENDIF(HAVE_INTTYPES_H)
! ENDIF(HAVE_STDINT_H)
  CHECK_SYMBOL_EXISTS(SSIZE_MAX        "limits.h"   HAVE_DECL_SSIZE_MAX)
  
--- 429,437 ----
  CHECK_SYMBOL_EXISTS(optarg           "unistd.h"   HAVE_DECL_OPTARG)
  CHECK_SYMBOL_EXISTS(optind           "unistd.h"   HAVE_DECL_OPTIND)
! CHECK_SYMBOL_EXISTS(INT64_MAX        "${headers}" HAVE_DECL_INT64_MAX)
! CHECK_SYMBOL_EXISTS(INT64_MIN        "${headers}" HAVE_DECL_INT64_MIN)
! CHECK_SYMBOL_EXISTS(UINT32_MAX       "${headers}" HAVE_DECL_UINT32_MAX)
! CHECK_SYMBOL_EXISTS(UINT64_MAX       "${headers}" HAVE_DECL_UINT64_MAX)
! CHECK_SYMBOL_EXISTS(SIZE_MAX         "${headers}" HAVE_DECL_SIZE_MAX)
  CHECK_SYMBOL_EXISTS(SSIZE_MAX        "limits.h"   HAVE_DECL_SSIZE_MAX)