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 0e71929e43279e3a806d476786a58d1c4e948083 (commit)
via 5695558f4a5f0d68cd1c200258b89d1524ff230f (commit)
from af34df7415c288c64b816938992e5b9ecfe5d312 (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=0e71929e43279e3a806d476786a58d1c4e948083
commit 0e71929e43279e3a806d476786a58d1c4e948083
Merge: af34df7 5695558
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 29 17:31:32 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Mar 29 13:31:52 2017 -0400
Stage topic 'sdcc-compiler-id'
Topic-id: 23359
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/644
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5695558f4a5f0d68cd1c200258b89d1524ff230f
commit 5695558f4a5f0d68cd1c200258b89d1524ff230f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 29 11:51:31 2017 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Mar 29 13:21:49 2017 -0400
SDCC: Fix identification of current sdcc compiler
The sdcc compiler no longer defines the `SDCC` preprocessor macro.
Instead `__SDCC_VERSION_MAJOR` and similar component-wise macros are
defined. Use them instead if defined.
Issue: #16746
diff --git a/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
b/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
index 1d7dd78..4c70c5e 100644
--- a/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
+++ b/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
@@ -1,10 +1,16 @@
# sdcc, the small devices C compiler for embedded systems,
# http://sdcc.sourceforge.net */
-set(_compiler_id_pp_test "defined(SDCC)")
+set(_compiler_id_pp_test "defined(__SDCC_VERSION_MAJOR) || defined(SDCC)")
set(_compiler_id_version_compute "
+# if defined(__SDCC_VERSION_MAJOR)
+# define COMPILER_VERSION_MAJOR @MACRO_DEC@(__SDCC_VERSION_MAJOR)
+# define COMPILER_VERSION_MINOR @MACRO_DEC@(__SDCC_VERSION_MINOR)
+# define COMPILER_VERSION_PATCH @MACRO_DEC@(__SDCC_VERSION_PATCH)
+# else
/* SDCC = VRP */
# define COMPILER_VERSION_MAJOR @MACRO_DEC@(SDCC/100)
# define COMPILER_VERSION_MINOR @MACRO_DEC@(SDCC/10 % 10)
-# define COMPILER_VERSION_PATCH @MACRO_DEC@(SDCC % 10)")
+# define COMPILER_VERSION_PATCH @MACRO_DEC@(SDCC % 10)
+# endif")
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/SDCC-C-DetermineCompiler.cmake | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
