kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix up compiler id to be more robust

Browse Source
This commit is contained in:
Bill Hoffman 2007-05-17 10:07:51 -04:00
parent 0c7130905d
commit 871f7cf222
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeCCompilerId.c
View File

@ -47,5 +47,5 @@ static char const info_compiler[] = "INFO:compiler["
/* Make sure the information strings are referenced. */ /* Make sure the information strings are referenced. */
int main() int main()
{ {
return ((int)&info_compiler) + ((int)&info_platform); return (&info_compiler[0] != &info_platform[0]);
} }

6
Modules/CMakeCXXCompilerId.cpp
View File

@ -48,9 +48,5 @@ static char const info_compiler[] = "INFO:compiler["
/* Make sure the information strings are referenced. */ /* Make sure the information strings are referenced. */
int main() int main()
{ {
if(&info_compiler[0] != &info_platform[0]) return (&info_compiler[0] != &info_platform[0]);
{
return 1;
}
return 0;
} }

11
Modules/CMakeDetermineCompilerId.cmake
View File

@ -53,6 +53,10 @@ MACRO(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
"${CMAKE_${lang}_COMPILER_ID_SRC}\" failed with the following output:\n" "${CMAKE_${lang}_COMPILER_ID_SRC}\" failed with the following output:\n"
"${CMAKE_${lang}_COMPILER_ID_RESULT}\n" "${CMAKE_${lang}_COMPILER_ID_RESULT}\n"
"${CMAKE_${lang}_COMPILER_ID_OUTPUT}\n\n") "${CMAKE_${lang}_COMPILER_ID_OUTPUT}\n\n")
MESSAGE(FATAL_ERROR "Compiling the ${lang} compiler identification source file \""
"${CMAKE_${lang}_COMPILER_ID_SRC}\" failed with the following output:\n"
"${CMAKE_${lang}_COMPILER_ID_RESULT}\n"
"${CMAKE_${lang}_COMPILER_ID_OUTPUT}\n\n")
ELSE(CMAKE_${lang}_COMPILER_ID_RESULT) ELSE(CMAKE_${lang}_COMPILER_ID_RESULT)
# Compilation succeeded. # Compilation succeeded.
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
@ -110,5 +114,12 @@ MACRO(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
"${CMAKE_${lang}_COMPILER_ID_DIR} " "${CMAKE_${lang}_COMPILER_ID_DIR} "
"with a name known to CMake.\n\n") "with a name known to CMake.\n\n")
ENDIF(CMAKE_${lang}_COMPILER_ID_EXE) ENDIF(CMAKE_${lang}_COMPILER_ID_EXE)
IF(CMAKE_${lang}_COMPILER_ID)
MESSAGE(STATUS "The ${lang} compiler identification is "
"${CMAKE_${lang}_COMPILER_ID}")
ELSE(CMAKE_${lang}_COMPILER_ID)
MESSAGE(STATUS "The ${lang} compiler identification is unknown")
ENDIF(CMAKE_${lang}_COMPILER_ID)
ENDIF(CMAKE_${lang}_COMPILER_ID_RESULT) ENDIF(CMAKE_${lang}_COMPILER_ID_RESULT)
ENDMACRO(CMAKE_DETERMINE_COMPILER_ID) ENDMACRO(CMAKE_DETERMINE_COMPILER_ID)