diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-14 13:45:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-14 13:46:18 (GMT) |
| commit | aec5dd482f7ed31b9d9dba1a778325ddbf8dbacf (patch) | |
| tree | a891d8e50a6e1e7990881e11d38ed02a8e9d5a9c | |
| parent | df52b85b0795404eec9e076ba4e6df7caaf40490 (diff) | |
| parent | 2a75edb3421fcceb3fb6d3a2ea07f931184ff8af (diff) | |
| download | CMake-aec5dd482f7ed31b9d9dba1a778325ddbf8dbacf.zip CMake-aec5dd482f7ed31b9d9dba1a778325ddbf8dbacf.tar.gz CMake-aec5dd482f7ed31b9d9dba1a778325ddbf8dbacf.tar.bz2 | |
Merge topic 'lcc-major-version'
2a75edb342 LCC: Fix extraction of __LCC__ version components
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8199
| -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 |