[cmake-commits] alex committed CMakeLists.txt 1.14 1.15

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmcurl
In directory public:/mounts/ram/cvs-serv28446

Modified Files:
	CMakeLists.txt 
Log Message:

STYLE: HAVE_LONG_LONG_CONST was completely unused here (it was used in the
(unused) copy of curl under CMake/CTest/Curl/ )

Alex


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/CMakeLists.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- CMakeLists.txt	10 Apr 2007 21:12:24 -0000	1.14
+++ CMakeLists.txt	9 Aug 2007 18:55:18 -0000	1.15
@@ -35,7 +35,13 @@
 INCLUDE (CheckIncludeFiles)
 INCLUDE (CheckLibraryExists)
 INCLUDE (CheckSymbolExists)
-INCLUDE (CheckTypeSize)
+# 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
   #  amigaos.c - does not build on AmigaOS
@@ -491,6 +497,7 @@
     ENDIF(${CURL_TEST})
   ENDIF("${CURL_TEST}" MATCHES "^${CURL_TEST}$")
 ENDMACRO(CURL_INTERNAL_TEST) 
+
 MACRO(CURL_INTERNAL_TEST_RUN CURL_TEST)
   IF("${CURL_TEST}_COMPILE" MATCHES "^${CURL_TEST}_COMPILE$")
     SET(MACRO_CHECK_FUNCTION_DEFINITIONS 
@@ -572,7 +579,6 @@
 FOREACH(CURL_TEST 
     HAVE_GLIBC_STRERROR_R
     HAVE_POSIX_STRERROR_R
-    HAVE_LONG_LONG_CONSTANT
     )
   CURL_INTERNAL_TEST_RUN(${CURL_TEST})
 ENDFOREACH(CURL_TEST)