diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-14 13:45:56 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-14 08:46:17 -0500 |
| commit | d18dd364d36fc4554c04d1c11e903817b0f5c73f (patch) | |
| tree | f67354174be958cce86e0b52c4f255dbab825d6f | |
| parent | e66bd7f584ebacb8b954ca804132aeac818c1a75 (diff) | |
| parent | 2a75edb3421fcceb3fb6d3a2ea07f931184ff8af (diff) | |
| download | cmake-d18dd364d36fc4554c04d1c11e903817b0f5c73f.tar.gz | |
Merge topic 'lcc-major-version' into release-3.26
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 2ce92fe3ae..3f462100f2 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 2ce92fe3ae..3f462100f2 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 |