[cmake-commits] king committed CheckTypeSize.cmake 1.3 1.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu May 17 15:17:47 EDT 2007
Update of /cvsroot/CMake/CMake/Source/CTest/Curl/CMake
In directory public:/mounts/ram/cvs-serv27851/Source/CTest/Curl/CMake
Modified Files:
CheckTypeSize.cmake
Log Message:
ENH: Use IF(NOT DEFINED) check to short-circuit size test.
Index: CheckTypeSize.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/Curl/CMake/CheckTypeSize.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CheckTypeSize.cmake 12 Jan 2006 18:49:01 -0000 1.3
+++ CheckTypeSize.cmake 17 May 2007 19:17:45 -0000 1.4
@@ -9,6 +9,7 @@
MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)
+ IF(NOT DEFINED ${VARIABLE})
IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
SET(MACRO_CHECK_TYPE_SIZE_FLAGS
"-DCHECK_TYPE_SIZE_TYPE=\"${TYPE}\" ${CMAKE_REQUIRED_FLAGS}")
@@ -47,5 +48,6 @@
"Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\nCheckTypeSize.c:\n${CHECK_TYPE_SIZE_FILE_CONTENT}\n\n")
ENDIF(HAVE_${VARIABLE})
ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+ ENDIF(NOT DEFINED ${VARIABLE})
SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )
ENDMACRO(CHECK_TYPE_SIZE)
More information about the Cmake-commits
mailing list