[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.6 1.7

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
libarchive: Fix integer type defaults for Windows

Most of the integer type defaults needed for MSVC and Borland actually
work with all Windows compilers.  This commit generalizes the defaults
to avoid compiler-specific tests.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/CMakeLists.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** CMakeLists.txt	4 Nov 2009 21:06:25 -0000	1.6
--- CMakeLists.txt	4 Nov 2009 22:17:57 -0000	1.7
***************
*** 478,484 ****
  CHECK_TYPE_SIZE(dev_t       DEV_T)
  IF(NOT HAVE_DEV_T)
!   IF(MSVC OR BORLAND)
!     SET(dev_t "unsigned int")
!   ENDIF(MSVC OR BORLAND)
  ENDIF(NOT HAVE_DEV_T)
  #
--- 478,482 ----
  CHECK_TYPE_SIZE(dev_t       DEV_T)
  IF(NOT HAVE_DEV_T)
!   SET(dev_t "unsigned int")
  ENDIF(NOT HAVE_DEV_T)
  #
***************
*** 503,525 ****
  CHECK_TYPE_SIZE(int64_t     INT64_T)
  IF(NOT HAVE_INT64_T)
!   IF(MSVC OR BORLAND)
!     SET(int64_t __int64)
!   ENDIF(MSVC OR BORLAND)
  ENDIF(NOT HAVE_INT64_T)
  #
  CHECK_TYPE_SIZE(intmax_t    INTMAX_T)
  IF(NOT HAVE_INTMAX_T)
!   IF(MSVC OR BORLAND)
!     SET(intmax_t "__int64")
!   ENDIF(MSVC OR BORLAND)
  ENDIF(NOT HAVE_INTMAX_T)
  #
  CHECK_TYPE_SIZE(mode_t      MODE_T)
  IF(NOT HAVE_MODE_T)
!   IF(MSVC OR BORLAND)
      SET(mode_t "unsigned short")
!   ELSE(MSVC OR BORLAND)
      SET(mode_t "int")
!   ENDIF(MSVC OR BORLAND)
  ENDIF(NOT HAVE_MODE_T)
  #
--- 501,521 ----
  CHECK_TYPE_SIZE(int64_t     INT64_T)
  IF(NOT HAVE_INT64_T)
!   IF(WIN32)
!     SET(int64_t "__int64")
!   ENDIF(WIN32)
  ENDIF(NOT HAVE_INT64_T)
  #
  CHECK_TYPE_SIZE(intmax_t    INTMAX_T)
  IF(NOT HAVE_INTMAX_T)
!   SET(intmax_t "int64_t")
  ENDIF(NOT HAVE_INTMAX_T)
  #
  CHECK_TYPE_SIZE(mode_t      MODE_T)
  IF(NOT HAVE_MODE_T)
!   IF(WIN32)
      SET(mode_t "unsigned short")
!   ELSE(WIN32)
      SET(mode_t "int")
!   ENDIF(WIN32)
  ENDIF(NOT HAVE_MODE_T)
  #
***************
*** 531,548 ****
  CHECK_TYPE_SIZE(size_t      SIZE_T)
  IF(NOT HAVE_SIZE_T)
!   SET(size_t "unsigned int")
  ENDIF(NOT HAVE_SIZE_T)
  #
  CHECK_TYPE_SIZE(ssize_t     SSIZE_T)
  IF(NOT HAVE_SSIZE_T)
!   IF(MSVC OR BORLAND)
!     IF(CMAKE_CL_64)
!       SET(ssize_t "__int64")
!     ELSE(CMAKE_CL_64)
!       SET(ssize_t   "signed long")
!     ENDIF(CMAKE_CL_64)
!   ELSE(MSVC OR BORLAND)
!       SET(ssize_t   "int")
!   ENDIF(MSVC OR BORLAND)
  ENDIF(NOT HAVE_SSIZE_T)
  #
--- 527,544 ----
  CHECK_TYPE_SIZE(size_t      SIZE_T)
  IF(NOT HAVE_SIZE_T)
!   IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
!     SET(size_t "uint64_t")
!   ELSE("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
!     SET(size_t   "uint32_t")
!   ENDIF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
  ENDIF(NOT HAVE_SIZE_T)
  #
  CHECK_TYPE_SIZE(ssize_t     SSIZE_T)
  IF(NOT HAVE_SSIZE_T)
!   IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
!     SET(ssize_t "int64_t")
!   ELSE("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
!     SET(ssize_t "long")
!   ENDIF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
  ENDIF(NOT HAVE_SSIZE_T)
  #
***************
*** 558,591 ****
  CHECK_TYPE_SIZE(uint16_t    UINT16_T)
  IF(NOT HAVE_UINT16_T)
!   IF(MSVC OR BORLAND)
!     SET(uint16_t "unsigned short")
!   ENDIF(MSVC OR BORLAND)
  ENDIF(NOT HAVE_UINT16_T)
  #
  CHECK_TYPE_SIZE(uint32_t    UINT32_T)
  IF(NOT HAVE_UINT32_T)
!   IF(MSVC OR BORLAND)
      SET(uint32_t "unsigned int")
!   ENDIF(MSVC OR BORLAND)
  ENDIF(NOT HAVE_UINT32_T)
  CHECK_TYPE_SIZE(int32_t    INT32_T)
  IF(NOT HAVE_INT32_T)
!   IF(MSVC OR BORLAND)
!     SET(int32_t "int")
!   ENDIF(MSVC OR BORLAND)
  ENDIF(NOT HAVE_INT32_T)
  #
  CHECK_TYPE_SIZE(uint64_t    UINT64_T)
  IF(NOT HAVE_UINT64_T)
!   IF(MSVC OR BORLAND)
      SET(uint64_t "unsigned __int64")
!   ENDIF(MSVC OR BORLAND)
  ENDIF(NOT HAVE_UINT64_T)
  #
  CHECK_TYPE_SIZE(uintmax_t   UINTMAX_T)
  IF(NOT HAVE_UINTMAX_T)
!   IF(MSVC OR BORLAND)
!     SET(uintmax_t "unsigned __int64")
!   ENDIF(MSVC OR BORLAND)
  ENDIF(NOT HAVE_UINTMAX_T)
  #
--- 554,581 ----
  CHECK_TYPE_SIZE(uint16_t    UINT16_T)
  IF(NOT HAVE_UINT16_T)
!   SET(uint16_t "unsigned short")
  ENDIF(NOT HAVE_UINT16_T)
  #
  CHECK_TYPE_SIZE(uint32_t    UINT32_T)
  IF(NOT HAVE_UINT32_T)
!   IF(WIN32)
      SET(uint32_t "unsigned int")
!   ENDIF(WIN32)
  ENDIF(NOT HAVE_UINT32_T)
  CHECK_TYPE_SIZE(int32_t    INT32_T)
  IF(NOT HAVE_INT32_T)
!   SET(int32_t "int")
  ENDIF(NOT HAVE_INT32_T)
  #
  CHECK_TYPE_SIZE(uint64_t    UINT64_T)
  IF(NOT HAVE_UINT64_T)
!   IF(WIN32)
      SET(uint64_t "unsigned __int64")
!   ENDIF(WIN32)
  ENDIF(NOT HAVE_UINT64_T)
  #
  CHECK_TYPE_SIZE(uintmax_t   UINTMAX_T)
  IF(NOT HAVE_UINTMAX_T)
!   SET(uintmax_t "uint64_t")
  ENDIF(NOT HAVE_UINTMAX_T)
  #