[cmake-commits] king committed CheckTypeSize.cmake 1.6 1.7
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu May 17 15:17:47 EDT 2007
Update of /cvsroot/CMake/CMake/Utilities/cmcurl/CMake
In directory public:/mounts/ram/cvs-serv27851/Utilities/cmcurl/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/Utilities/cmcurl/CMake/CheckTypeSize.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CheckTypeSize.cmake 14 Jun 2006 16:28:32 -0000 1.6
+++ CheckTypeSize.cmake 17 May 2007 19:17:45 -0000 1.7
@@ -8,6 +8,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(CHECK_TYPE_SIZE_TYPE "${TYPE}")
SET(MACRO_CHECK_TYPE_SIZE_FLAGS
@@ -50,5 +51,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