diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-13 14:24:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-02-13 14:29:32 (GMT) |
| commit | 2a75edb3421fcceb3fb6d3a2ea07f931184ff8af (patch) | |
| tree | f67354174be958cce86e0b52c4f255dbab825d6f /Modules/Compiler | |
| parent | e66bd7f584ebacb8b954ca804132aeac818c1a75 (diff) | |
| download | CMake-2a75edb3421fcceb3fb6d3a2ea07f931184ff8af.zip CMake-2a75edb3421fcceb3fb6d3a2ea07f931184ff8af.tar.gz CMake-2a75edb3421fcceb3fb6d3a2ea07f931184ff8af.tar.bz2 | |
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.
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/LCC-C-DetermineCompiler.cmake | 6 | ||||
| -rw-r--r-- | Modules/Compiler/LCC-CXX-DetermineCompiler.cmake | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Modules/Compiler/LCC-C-DetermineCompiler.cmake b/Modules/Compiler/LCC-C-DetermineCompiler.cmake index 2ce92fe..3f46210 100644 --- a/Modules/Compiler/LCC-C-DetermineCompiler.cmake +++ b/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 diff --git a/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake b/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake index 2ce92fe..3f46210 100644 --- a/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake +++ b/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 |