Parcourir la source

Merge branch 'sdcc-compiler-id' into release

Brad King il y a 8 ans
Parent
commit
cb4e731347
1 fichiers modifiés avec 8 ajouts et 2 suppressions
  1. 8 2
      Modules/Compiler/SDCC-C-DetermineCompiler.cmake

+ 8 - 2
Modules/Compiler/SDCC-C-DetermineCompiler.cmake

@@ -1,10 +1,16 @@
 
 
 # sdcc, the small devices C compiler for embedded systems,
 # sdcc, the small devices C compiler for embedded systems,
 #   http://sdcc.sourceforge.net  */
 #   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 "
 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 */
   /* SDCC = VRP */
 #  define COMPILER_VERSION_MAJOR @MACRO_DEC@(SDCC/100)
 #  define COMPILER_VERSION_MAJOR @MACRO_DEC@(SDCC/100)
 #  define COMPILER_VERSION_MINOR @MACRO_DEC@(SDCC/10 % 10)
 #  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")