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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
libarchive: Fix intptr_t and uintptr_t configuration


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/CMakeLists.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** CMakeLists.txt	3 Nov 2009 22:40:44 -0000	1.5
--- CMakeLists.txt	4 Nov 2009 21:06:25 -0000	1.6
***************
*** 590,593 ****
--- 590,611 ----
  ENDIF(NOT HAVE_UINTMAX_T)
  #
+ CHECK_TYPE_SIZE(intptr_t   INTPTR_T)
+ IF(NOT HAVE_INTPTR_T)
+   IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
+     SET(intptr_t "int64_t")
+   ELSE()
+     SET(intptr_t "int32_t")
+   ENDIF()
+ ENDIF(NOT HAVE_INTPTR_T)
+ #
+ CHECK_TYPE_SIZE(uintptr_t   UINTPTR_T)
+ IF(NOT HAVE_UINTPTR_T)
+   IF("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
+     SET(uintptr_t "uint64_t")
+   ELSE()
+     SET(uintptr_t "uint32_t")
+   ENDIF()
+ ENDIF(NOT HAVE_UINTPTR_T)
+ #
  CHECK_TYPE_SIZE(wchar_t     SIZEOF_WCHAR_T)
  IF(HAVE_SIZEOF_WCHAR_T)