[Cmake-commits] CMake branch, next, updated. v3.3.0-2218-g8b8e175
Brad King
brad.king at kitware.com
Thu Aug 13 11:08:22 EDT 2015
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 8b8e175c162944513de1bf722dcf0b03abe27258 (commit)
via 6699834d6298eabe53f2c15d051fbe16cc9014c3 (commit)
from 8f32935592cb7012f491b7e3467f567abfb287f1 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b8e175c162944513de1bf722dcf0b03abe27258
commit 8b8e175c162944513de1bf722dcf0b03abe27258
Merge: 8f32935 6699834
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 13 11:08:21 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 13 11:08:21 2015 -0400
Merge topic 'compiler-id-ancient-gcc-version' into next
6699834d GNU-DetermineCompiler: Add support for very old versions of GCC
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6699834d6298eabe53f2c15d051fbe16cc9014c3
commit 6699834d6298eabe53f2c15d051fbe16cc9014c3
Author: Kars de Jong <kars.dejong at locamation.nl>
AuthorDate: Thu Aug 13 13:33:37 2015 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 13 11:07:03 2015 -0400
GNU-DetermineCompiler: Add support for very old versions of GCC
Very old versions of gcc (2.3.1) do not define __GNUC_MINOR__.
Signed-off-by: Kars de Jong <kars.dejong at locamation.nl>
diff --git a/Modules/Compiler/GNU-DetermineCompiler.cmake b/Modules/Compiler/GNU-DetermineCompiler.cmake
index 261f148..6ddc566 100644
--- a/Modules/Compiler/GNU-DetermineCompiler.cmake
+++ b/Modules/Compiler/GNU-DetermineCompiler.cmake
@@ -3,7 +3,9 @@ set(_compiler_id_pp_test "defined(__GNUC__)")
set(_compiler_id_version_compute "
# define @PREFIX at COMPILER_VERSION_MAJOR @MACRO_DEC@(__GNUC__)
-# define @PREFIX at COMPILER_VERSION_MINOR @MACRO_DEC@(__GNUC_MINOR__)
+# if defined(__GNUC_MINOR__)
+# define @PREFIX at COMPILER_VERSION_MINOR @MACRO_DEC@(__GNUC_MINOR__)
+# endif
# if defined(__GNUC_PATCHLEVEL__)
# define @PREFIX at COMPILER_VERSION_PATCH @MACRO_DEC@(__GNUC_PATCHLEVEL__)
# endif")
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/GNU-DetermineCompiler.cmake | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list