diff options
| author | Brad King <brad.king@kitware.com> | 2008-02-03 17:24:50 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-02-03 17:24:50 -0500 |
| commit | bbbb2be765856a8c40e71e5bf6fd703cc3d603aa (patch) | |
| tree | 882f0a8a5105bd37ae5fd596242e3c192937b1b1 /Modules/CMakeForceCompiler.cmake | |
| parent | dc06ac58817672ca9931a4a4c177e18d679b6573 (diff) | |
| download | cmake-bbbb2be765856a8c40e71e5bf6fd703cc3d603aa.tar.gz | |
BUG: When forcing the C and CXX compilers do not try to detect the ABI information. Cleanup configured language compiler info files by always using @ONLY. This addresses bug#6297.
Diffstat (limited to 'Modules/CMakeForceCompiler.cmake')
| -rw-r--r-- | Modules/CMakeForceCompiler.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/CMakeForceCompiler.cmake b/Modules/CMakeForceCompiler.cmake index 79ac054a79..f525ff904e 100644 --- a/Modules/CMakeForceCompiler.cmake +++ b/Modules/CMakeForceCompiler.cmake @@ -38,14 +38,14 @@ MACRO(CMAKE_FORCE_C_COMPILER compiler id sizeof_void) SET(CMAKE_C_COMPILER_ID_RUN TRUE) SET(CMAKE_C_COMPILER_ID ${id}) SET(CMAKE_C_COMPILER_WORKS TRUE) + SET(CMAKE_C_COMPILER_FORCED TRUE) # Set old compiler and platform id variables. IF("${CMAKE_C_COMPILER_ID}" MATCHES "GNU") SET(CMAKE_COMPILER_IS_GNUCC 1) ENDIF("${CMAKE_C_COMPILER_ID}" MATCHES "GNU") - SET(CMAKE_SIZEOF_VOID_P ${sizeof_void} CACHE STRING "sizeof void") - SET(HAVE_CMAKE_SIZEOF_VOID_P TRUE CACHE INTERNAL "have sizeof void") + SET(CMAKE_C_SIZEOF_DATA_PTR ${sizeof_void}) ENDMACRO(CMAKE_FORCE_C_COMPILER) MACRO(CMAKE_FORCE_CXX_COMPILER compiler id) @@ -53,6 +53,7 @@ MACRO(CMAKE_FORCE_CXX_COMPILER compiler id) SET(CMAKE_CXX_COMPILER_ID_RUN TRUE) SET(CMAKE_CXX_COMPILER_ID ${id}) SET(CMAKE_CXX_COMPILER_WORKS TRUE) + SET(CMAKE_CXX_COMPILER_FORCED TRUE) IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") SET(CMAKE_COMPILER_IS_GNUCXX 1) |