[Cmake-commits] CMake branch, master, updated. v3.14.3-774-g1c7863a

[Kitware Robot]

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, master has been updated
       via  1c7863a7654724af0afca6d20b80a50153f6d5f7 (commit)
       via  a893018c47dba503caca0c8e2e22d12aaa9b6752 (commit)
      from  a40c9825bbb1ce5ac43b041bcd54a5cea85f4a92 (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=1c7863a7654724af0afca6d20b80a50153f6d5f7
commit 1c7863a7654724af0afca6d20b80a50153f6d5f7
Merge: a40c982 a893018
Author:     Kyle Edwards <kyle.edwards at kitware.com>
AuthorDate: Mon Apr 29 14:40:31 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Apr 29 10:40:39 2019 -0400

    Merge topic 'intel_simulate'
    
    a893018c47 Project: Report intel's simulation of gcc.
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3264


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a893018c47dba503caca0c8e2e22d12aaa9b6752
commit a893018c47dba503caca0c8e2e22d12aaa9b6752
Author:     R. Andrew Ohana <rao at esi-group.com>
AuthorDate: Mon Apr 1 13:56:17 2019 -0700
Commit:     R. Andrew Ohana <rao at esi-group.com>
CommitDate: Thu Apr 25 13:37:44 2019 -0700

    Project: Report intel's simulation of gcc.

diff --git a/Modules/Compiler/Intel-DetermineCompiler.cmake b/Modules/Compiler/Intel-DetermineCompiler.cmake
index d7e4532..c31aa77 100644
--- a/Modules/Compiler/Intel-DetermineCompiler.cmake
+++ b/Modules/Compiler/Intel-DetermineCompiler.cmake
@@ -18,9 +18,23 @@ set(_compiler_id_version_compute "
    /* _MSC_VER = VVRR */
 #  define @PREFIX at SIMULATE_VERSION_MAJOR @MACRO_DEC@(_MSC_VER / 100)
 #  define @PREFIX at SIMULATE_VERSION_MINOR @MACRO_DEC@(_MSC_VER % 100)
+# endif
+# if defined(__GNUC__)
+#  define @PREFIX at SIMULATE_VERSION_MAJOR @MACRO_DEC@(__GNUC__)
+# elif defined(__GNUG__)
+#  define @PREFIX at SIMULATE_VERSION_MAJOR @MACRO_DEC@(__GNUG__)
+# endif
+# if defined(__GNUC_MINOR__)
+#  define @PREFIX at SIMULATE_VERSION_MINOR @MACRO_DEC@(__GNUC_MINOR__)
+# endif
+# if defined(__GNUC_PATCHLEVEL__)
+#  define @PREFIX at SIMULATE_VERSION_PATCH @MACRO_DEC@(__GNUC_PATCHLEVEL__)
 # endif")
 
 set(_compiler_id_simulate "
 # if defined(_MSC_VER)
 #  define @PREFIX at SIMULATE_ID \"MSVC\"
+# endif
+# if defined(__GNUC__)
+#  define @PREFIX at SIMULATE_ID \"GNU\"
 # endif")

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

Summary of changes:
 Modules/Compiler/Intel-DetermineCompiler.cmake | 14 ++++++++++++++
 1 file changed, 14 insertions(+)


hooks/post-receive
-- 
CMake