summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-01-27 14:04:56 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2017-01-27 14:04:56 (GMT)
commit0ea578b498059340d575be263f5b6a91581f5ce5 (patch)
treee8b53517eb81b8fa8b99d364ffe3afa6dab1aa50
parent86ec0aca050f2568cea691a0ec965f6a95e06d2b (diff)
parent24d73fa0eb2e9f7cdc8fb8192445ce3ee04cf7d3 (diff)
downloadCMake-0ea578b498059340d575be263f5b6a91581f5ce5.zip
CMake-0ea578b498059340d575be263f5b6a91581f5ce5.tar.gz
CMake-0ea578b498059340d575be263f5b6a91581f5ce5.tar.bz2
Merge topic 'GNUG_define'
24d73fa0 GNUC: also check __GNUG__ define when checking for g++
-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.cmake15
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")