summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-01-10 14:19:44 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-01-10 14:19:44 (GMT)
commit58b34959e37580d07aeb6bf4973bcb1173322ead (patch)
tree567206b1a6aa8d5eaec133893820e75de42c340e
parent00f53bc260ae7febd13616b1843b241dc3c07966 (diff)
parent8252406cd6dccb1c62541bb9ea209b4618d9c1f7 (diff)
downloadCMake-58b34959e37580d07aeb6bf4973bcb1173322ead.zip
CMake-58b34959e37580d07aeb6bf4973bcb1173322ead.tar.gz
CMake-58b34959e37580d07aeb6bf4973bcb1173322ead.tar.bz2
Merge topic 'CheckTypeSize_fix_multiple_invocation'
8252406 CheckTypeSize: Unset temporary variables when done (#14690)
-rw-r--r--Modules/CheckTypeSize.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index a9efae4..ec28d8b 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -222,6 +222,8 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE)
check_include_file(stdint.h HAVE_STDINT_H)
check_include_file(stddef.h HAVE_STDDEF_H)
endif()
+ unset(_CHECK_TYPE_SIZE_BUILTIN_TYPES_ONLY)
+ unset(_CHECK_TYPE_SIZE_LANGUAGE)
# Compute or load the size or size map.
set(${VARIABLE}_KEYS)