[Cmake-commits] CMake branch, master, updated. v3.14.3-774-g1c7863a
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 AuthorDate: Mon Apr 29 14:40:31 2019 + Commit: Kitware Robot 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 Merge-request: !3264 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a893018c47dba503caca0c8e2e22d12aaa9b6752 commit a893018c47dba503caca0c8e2e22d12aaa9b6752 Author: R. Andrew Ohana AuthorDate: Mon Apr 1 13:56:17 2019 -0700 Commit: R. Andrew Ohana 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@SIMULATE_VERSION_MAJOR @MACRO_DEC@(_MSC_VER / 100) # define @PREFIX@SIMULATE_VERSION_MINOR @MACRO_DEC@(_MSC_VER % 100) +# endif +# if defined(__GNUC__) +# define @PREFIX@SIMULATE_VERSION_MAJOR @MACRO_DEC@(__GNUC__) +# elif defined(__GNUG__) +# define @PREFIX@SIMULATE_VERSION_MAJOR @MACRO_DEC@(__GNUG__) +# endif +# if defined(__GNUC_MINOR__) +# define @PREFIX@SIMULATE_VERSION_MINOR @MACRO_DEC@(__GNUC_MINOR__) +# endif +# if defined(__GNUC_PATCHLEVEL__) +# define @PREFIX@SIMULATE_VERSION_PATCH @MACRO_DEC@(__GNUC_PATCHLEVEL__) # endif") set(_compiler_id_simulate " # if defined(_MSC_VER) # define @PREFIX@SIMULATE_ID \"MSVC\" +# endif +# if defined(__GNUC__) +# define @PREFIX@SIMULATE_ID \"GNU\" # endif") --- Summary of changes: Modules/Compiler/Intel-DetermineCompiler.cmake | 14 ++ 1 file changed, 14 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.3-775-g4eebc52
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 4eebc52eca3d551423d7e512284a3b71e13d30a0 (commit) from 1c7863a7654724af0afca6d20b80a50153f6d5f7 (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=4eebc52eca3d551423d7e512284a3b71e13d30a0 commit 4eebc52eca3d551423d7e512284a3b71e13d30a0 Author: Kitware Robot AuthorDate: Tue Apr 30 00:01:05 2019 -0400 Commit: Kitware Robot CommitDate: Tue Apr 30 00:01:05 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 51b69ba..a7e8ee1 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 14) -set(CMake_VERSION_PATCH 20190429) +set(CMake_VERSION_PATCH 20190430) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
