1
0
Эх сурвалжийг харах

LCC: Fix extraction of __LCC__ version components

Previously the logic only worked for major versions of the form `1.xx`.
Fix it to work with versions `2.xx` and above.
Brad King 2 жил өмнө
parent
commit
2a75edb342

+ 2 - 4
Modules/Compiler/LCC-C-DetermineCompiler.cmake

@@ -2,10 +2,8 @@
 set(_compiler_id_pp_test "defined(__LCC__) && (defined(__GNUC__) || defined(__GNUG__) || defined(__MCST__))")
 
 set(_compiler_id_version_compute "
-# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(1)
-# if defined(__LCC__)
-#  define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__LCC__- 100)
-# endif
+# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__LCC__ / 100)
+# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__LCC__ % 100)
 # if defined(__LCC_MINOR__)
 #  define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__LCC_MINOR__)
 # endif

+ 2 - 4
Modules/Compiler/LCC-CXX-DetermineCompiler.cmake

@@ -2,10 +2,8 @@
 set(_compiler_id_pp_test "defined(__LCC__) && (defined(__GNUC__) || defined(__GNUG__) || defined(__MCST__))")
 
 set(_compiler_id_version_compute "
-# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(1)
-# if defined(__LCC__)
-#  define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__LCC__- 100)
-# endif
+# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__LCC__ / 100)
+# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__LCC__ % 100)
 # if defined(__LCC_MINOR__)
 #  define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__LCC_MINOR__)
 # endif