diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-30 12:59:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-30 12:59:05 (GMT) |
| commit | a820327d1ae7c32df46cfa5b3caf56184d46eb72 (patch) | |
| tree | f4cff09e6239c6f5883bec85124333136000ab7f | |
| parent | d66081b546c55c2066da0eac473b7a1d1d040936 (diff) | |
| parent | 5695558f4a5f0d68cd1c200258b89d1524ff230f (diff) | |
| download | CMake-a820327d1ae7c32df46cfa5b3caf56184d46eb72.zip CMake-a820327d1ae7c32df46cfa5b3caf56184d46eb72.tar.gz CMake-a820327d1ae7c32df46cfa5b3caf56184d46eb72.tar.bz2 | |
Merge topic 'sdcc-compiler-id'
5695558f SDCC: Fix identification of current sdcc compiler
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !644
| -rw-r--r-- | Modules/Compiler/SDCC-C-DetermineCompiler.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
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") |