diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-11-14 19:21:39 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-11-14 19:21:39 (GMT) |
| commit | 03e2911e55541a92df69e9ac3bc8eb161b349779 (patch) | |
| tree | 4c8df8442a8acf88502c501bb190d1b00a2ded88 | |
| parent | 6174cc7091fec5e8c5e45e6e77de8bf716e9417c (diff) | |
| download | CMake-03e2911e55541a92df69e9ac3bc8eb161b349779.zip CMake-03e2911e55541a92df69e9ac3bc8eb161b349779.tar.gz CMake-03e2911e55541a92df69e9ac3bc8eb161b349779.tar.bz2 | |
BUG: fix SIZEOF VOIDP problem
| -rw-r--r-- | Modules/CMakeCCompiler.cmake.in | 4 | ||||
| -rw-r--r-- | Modules/CMakeTestCCompiler.cmake | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in index 9dc9737..dcd8054 100644 --- a/Modules/CMakeCCompiler.cmake.in +++ b/Modules/CMakeCCompiler.cmake.in @@ -25,4 +25,6 @@ IF(UNIX) ELSE(UNIX) SET(CMAKE_C_OUTPUT_EXTENSION .obj) ENDIF(UNIX) - +# save the size of void* in case where cache is removed +# and the this file is still around +SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@) diff --git a/Modules/CMakeTestCCompiler.cmake b/Modules/CMakeTestCCompiler.cmake index f9aee68..096c790 100644 --- a/Modules/CMakeTestCCompiler.cmake +++ b/Modules/CMakeTestCCompiler.cmake @@ -36,4 +36,10 @@ ELSE(NOT CMAKE_C_COMPILER_WORKS) # Check the size of void*. This used to be "void *" but icc expands the *. CHECK_TYPE_SIZE("void*" CMAKE_SIZEOF_VOID_P) SET(CMAKE_C_COMPILER_WORKS 1 CACHE INTERNAL "") + # re-configure this file CMakeCCompiler.cmake so that it gets + # the value for CMAKE_SIZEOF_VOID_P + # configure variables set in this file for fast reload later on + CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeCCompiler.cmake.in + ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeCCompiler.cmake IMMEDIATE) ENDIF(NOT CMAKE_C_COMPILER_WORKS) + |