diff options
| author | James Johnston <johnstonj.public@codenest.com> | 2015-12-03 21:24:56 (GMT) |
|---|---|---|
| committer | James Johnston <johnstonj.public@codenest.com> | 2015-12-03 21:37:08 (GMT) |
| commit | 7a3277276e69c92d0f69674cdc27bae11bcbc14f (patch) | |
| tree | f8cb306e1f1ebb25652a2257994e3b4835691a22 | |
| parent | 25211d756fad353e96d29e289d40d780a5341c92 (diff) | |
| download | CMake-7a3277276e69c92d0f69674cdc27bae11bcbc14f.zip CMake-7a3277276e69c92d0f69674cdc27bae11bcbc14f.tar.gz CMake-7a3277276e69c92d0f69674cdc27bae11bcbc14f.tar.bz2 | |
Embarcadero: Fix erroneous interpretation of __CODEGEARC_VERSION__.
As per the following link:
http://docwiki.embarcadero.com/RADStudio/Seattle/en/Example_of_CODEGEARC_VERSION_Macro
The major/minor versions must be decoded as a hex string, while the patch
version must be decoded as a normal decimal string.
As an example, C++ Builder XE 8.1's bcc32.exe sets this macro to 0x070189C9.
The file version of bcc32.exe is 7.1.5570.35273. Therefore, the correct
interpretation to COMPILER_VERSION would be 7.1.35273.
| -rw-r--r-- | Modules/Compiler/Embarcadero-DetermineCompiler.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Compiler/Embarcadero-DetermineCompiler.cmake b/Modules/Compiler/Embarcadero-DetermineCompiler.cmake index 2feedac..8375624 100644 --- a/Modules/Compiler/Embarcadero-DetermineCompiler.cmake +++ b/Modules/Compiler/Embarcadero-DetermineCompiler.cmake @@ -4,4 +4,4 @@ set(_compiler_id_pp_test "defined(__BORLANDC__) && defined(__CODEGEARC_VERSION__ set(_compiler_id_version_compute " # define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_HEX@(__CODEGEARC_VERSION__>>24 & 0x00FF) # define @PREFIX@COMPILER_VERSION_MINOR @MACRO_HEX@(__CODEGEARC_VERSION__>>16 & 0x00FF) -# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_HEX@(__CODEGEARC_VERSION__ & 0xFFFF)") +# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__CODEGEARC_VERSION__ & 0xFFFF)") |