[Cmake-commits] CMake branch, next, updated. v3.7.2-2359-g63bba4d

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  63bba4d2b9d729ffb852e93df4b04c6635f04c21 (commit)
       via  24d73fa0eb2e9f7cdc8fb8192445ce3ee04cf7d3 (commit)
      from  1325cfc3a76387a327b5758adcf8ef42f2e19af3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63bba4d2b9d729ffb852e93df4b04c6635f04c21
commit 63bba4d2b9d729ffb852e93df4b04c6635f04c21
Merge: 1325cfc 24d73fa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 11:05:46 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 11:05:46 2017 -0500

    Merge topic 'GNUG_define' into next
    
    24d73fa0 GNUC: also check __GNUG__ define when checking for g++


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24d73fa0eb2e9f7cdc8fb8192445ce3ee04cf7d3
commit 24d73fa0eb2e9f7cdc8fb8192445ce3ee04cf7d3
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 21:53:40 2017 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jan 25 21:53:40 2017 +0100

    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.

diff --git a/Modules/Compiler/GNU-DetermineCompiler.cmake b/Modules/Compiler/GNU-C-DetermineCompiler.cmake
similarity index 100%
copy from Modules/Compiler/GNU-DetermineCompiler.cmake
copy to Modules/Compiler/GNU-C-DetermineCompiler.cmake
diff --git a/Modules/Compiler/GNU-DetermineCompiler.cmake b/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
similarity index 53%
rename from Modules/Compiler/GNU-DetermineCompiler.cmake
rename to Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
index 6ddc566..c25b147 100644
--- a/Modules/Compiler/GNU-DetermineCompiler.cmake
+++ b/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
@@ -1,8 +1,12 @@
 
-set(_compiler_id_pp_test "defined(__GNUC__)")
+set(_compiler_id_pp_test "defined(__GNUC__) || defined(__GNUG__)")
 
 set(_compiler_id_version_compute "
-# define @PREFIX at COMPILER_VERSION_MAJOR @MACRO_DEC@(__GNUC__)
+# if defined(__GNUC__)
+#  define @PREFIX at COMPILER_VERSION_MAJOR @MACRO_DEC@(__GNUC__)
+# else
+#  define @PREFIX at COMPILER_VERSION_MAJOR @MACRO_DEC@(__GNUG__)
+# endif
 # if defined(__GNUC_MINOR__)
 #  define @PREFIX at COMPILER_VERSION_MINOR @MACRO_DEC@(__GNUC_MINOR__)
 # endif

-----------------------------------------------------------------------

Summary of changes:
 ...U-DetermineCompiler.cmake => GNU-C-DetermineCompiler.cmake} |    0
 ...DetermineCompiler.cmake => GNU-CXX-DetermineCompiler.cmake} |    8 ++++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 copy Modules/Compiler/{GNU-DetermineCompiler.cmake => GNU-C-DetermineCompiler.cmake} (100%)
 rename Modules/Compiler/{GNU-DetermineCompiler.cmake => GNU-CXX-DetermineCompiler.cmake} (53%)


hooks/post-receive
-- 
CMake