diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2017-01-25 20:53:40 (GMT) |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2017-01-25 20:53:40 (GMT) |
| commit | 24d73fa0eb2e9f7cdc8fb8192445ce3ee04cf7d3 (patch) | |
| tree | 1fad1e3d9da720991be6e4d436f0816e599a8666 /Modules/Compiler | |
| parent | 014365ea97848654cc9493225399528f8b7b15b7 (diff) | |
| download | CMake-24d73fa0eb2e9f7cdc8fb8192445ce3ee04cf7d3.zip CMake-24d73fa0eb2e9f7cdc8fb8192445ce3ee04cf7d3.tar.gz CMake-24d73fa0eb2e9f7cdc8fb8192445ce3ee04cf7d3.tar.bz2 | |
GNUC: also check __GNUG__ define when checking for g++
At least the scratchbox compiler for the N900, which basically is a gcc 4.2,
sets only __GNUG__ in C++ mode, but not __GNUC__. It does indeed set
__GNUC_MINOR__ and __GNUC_PATCHLEVEL__. Extend the compiler detection code for
GNU compilers in C++ mode to look at __GNUG__ in case __GNUC__ is absent.
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/GNU-C-DetermineCompiler.cmake (renamed from Modules/Compiler/GNU-DetermineCompiler.cmake) | 0 | ||||
| -rw-r--r-- | Modules/Compiler/GNU-CXX-DetermineCompiler.cmake | 15 |
2 files changed, 15 insertions, 0 deletions
diff --git a/Modules/Compiler/GNU-DetermineCompiler.cmake b/Modules/Compiler/GNU-C-DetermineCompiler.cmake index 6ddc566..6ddc566 100644 --- a/Modules/Compiler/GNU-DetermineCompiler.cmake +++ b/Modules/Compiler/GNU-C-DetermineCompiler.cmake diff --git a/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake b/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake new file mode 100644 index 0000000..c25b147 --- /dev/null +++ b/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake @@ -0,0 +1,15 @@ + +set(_compiler_id_pp_test "defined(__GNUC__) || defined(__GNUG__)") + +set(_compiler_id_version_compute " +# if defined(__GNUC__) +# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__GNUC__) +# else +# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__GNUG__) +# endif +# if defined(__GNUC_MINOR__) +# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__GNUC_MINOR__) +# endif +# if defined(__GNUC_PATCHLEVEL__) +# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__GNUC_PATCHLEVEL__) +# endif") |