[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.3 1.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Sun Nov 1 12:41:19 EST 2009
Update of /cvsroot/CMake/CMake/Utilities/cmlibarchive
In directory public:/mounts/ram/cvs-serv14442
Modified Files:
CMakeLists.txt
Log Message:
Fixes for borland, compiles with lots of warnings, but compiles, might fix vs70 again too.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/CMakeLists.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CMakeLists.txt 30 Oct 2009 22:07:44 -0000 1.3
--- CMakeLists.txt 1 Nov 2009 17:41:17 -0000 1.4
***************
*** 478,484 ****
CHECK_TYPE_SIZE(dev_t DEV_T)
IF(NOT HAVE_DEV_T)
! IF(MSVC)
SET(dev_t "unsigned int")
! ENDIF(MSVC)
ENDIF(NOT HAVE_DEV_T)
#
--- 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)
#
***************
*** 503,530 ****
CHECK_TYPE_SIZE(int64_t INT64_T)
IF(NOT HAVE_INT64_T)
! IF(MSVC)
SET(int64_t __int64)
! ENDIF(MSVC)
ENDIF(NOT HAVE_INT64_T)
#
CHECK_TYPE_SIZE(intmax_t INTMAX_T)
IF(NOT HAVE_INTMAX_T)
! IF(MSVC)
! SET(intmax_t "long long")
! ENDIF(MSVC)
ENDIF(NOT HAVE_INTMAX_T)
#
CHECK_TYPE_SIZE(mode_t MODE_T)
IF(NOT HAVE_MODE_T)
! IF(MSVC)
SET(mode_t "unsigned short")
! ELSE(MSVC)
SET(mode_t "int")
! ENDIF(MSVC)
ENDIF(NOT HAVE_MODE_T)
#
CHECK_TYPE_SIZE(off_t OFF_T)
IF(NOT HAVE_OFF_T)
! SET(off_t "long long")
ENDIF(NOT HAVE_OFF_T)
#
--- 503,530 ----
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)
#
CHECK_TYPE_SIZE(off_t OFF_T)
IF(NOT HAVE_OFF_T)
! SET(off_t "__int64")
ENDIF(NOT HAVE_OFF_T)
#
***************
*** 536,540 ****
CHECK_TYPE_SIZE(ssize_t SSIZE_T)
IF(NOT HAVE_SSIZE_T)
! IF(MSVC)
IF(CMAKE_CL_64)
SET(ssize_t "__int64")
--- 536,540 ----
CHECK_TYPE_SIZE(ssize_t SSIZE_T)
IF(NOT HAVE_SSIZE_T)
! IF(MSVC OR BORLAND)
IF(CMAKE_CL_64)
SET(ssize_t "__int64")
***************
*** 542,548 ****
SET(ssize_t "signed long")
ENDIF(CMAKE_CL_64)
! ELSE(MSVC)
SET(ssize_t "int")
! ENDIF(MSVC)
ENDIF(NOT HAVE_SSIZE_T)
#
--- 542,548 ----
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)
#
***************
*** 558,591 ****
CHECK_TYPE_SIZE(uint16_t UINT16_T)
IF(NOT HAVE_UINT16_T)
! IF(MSVC)
SET(uint16_t "unsigned short")
! ENDIF(MSVC)
ENDIF(NOT HAVE_UINT16_T)
#
CHECK_TYPE_SIZE(uint32_t UINT32_T)
IF(NOT HAVE_UINT32_T)
! IF(MSVC)
SET(uint32_t "unsigned int")
! ENDIF(MSVC)
ENDIF(NOT HAVE_UINT32_T)
CHECK_TYPE_SIZE(int32_t INT32_T)
IF(NOT HAVE_INT32_T)
! IF(MSVC)
SET(int32_t "int")
! ENDIF(MSVC)
ENDIF(NOT HAVE_INT32_T)
#
CHECK_TYPE_SIZE(uint64_t UINT64_T)
IF(NOT HAVE_UINT64_T)
! IF(MSVC)
SET(uint64_t "unsigned __int64")
! ENDIF(MSVC)
ENDIF(NOT HAVE_UINT64_T)
#
CHECK_TYPE_SIZE(uintmax_t UINTMAX_T)
IF(NOT HAVE_UINTMAX_T)
! IF(MSVC)
! SET(uintmax_t "unsigned long long")
! ENDIF(MSVC)
ENDIF(NOT HAVE_UINTMAX_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)
#
More information about the Cmake-commits
mailing list