summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-03-29 13:22:06 -0400
committerBrad King <brad.king@kitware.com>2017-03-29 13:22:06 -0400
commitcb4e731347e255f2bbb1f2d9593d8080c8718c5b (patch)
treeac539c2afaa67b2099c3e94af5fe4cb6dd115207
parent6ca509e7c65a94f4b486bacef766bac717f5308f (diff)
parent5695558f4a5f0d68cd1c200258b89d1524ff230f (diff)
downloadcmake-cb4e731347e255f2bbb1f2d9593d8080c8718c5b.tar.gz
Merge branch 'sdcc-compiler-id' into release
-rw-r--r--Modules/Compiler/SDCC-C-DetermineCompiler.cmake10
1 files changed, 8 insertions, 2 deletions
diff --git a/Modules/Compiler/SDCC-C-DetermineCompiler.cmake b/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
index 1d7dd78d88..4c70c5ec49 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")