[cmake-commits] king committed CheckTypeSize.cmake 1.24 1.25

cmake-commits at cmake.org cmake-commits at cmake.org
Thu May 17 15:17:47 EDT 2007


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv27851/Modules

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/Modules/CheckTypeSize.cmake,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- CheckTypeSize.cmake	17 May 2007 17:20:43 -0000	1.24
+++ CheckTypeSize.cmake	17 May 2007 19:17:45 -0000	1.25
@@ -13,8 +13,8 @@
 #  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
 
 MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
-  IF(NOT DEFINED ${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 
@@ -65,6 +65,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}$")
-  SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )
   ENDIF(NOT DEFINED ${VARIABLE})
+  SET(CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS )
 ENDMACRO(CHECK_TYPE_SIZE)



More information about the Cmake-commits mailing list