diff options
| author | Josef Angstenberger <code@jtxa.de> | 2020-08-31 23:58:43 (GMT) |
|---|---|---|
| committer | Josef Angstenberger <code@jtxa.de> | 2020-09-20 22:57:20 (GMT) |
| commit | 6a66bb13ed80398d908bc07a89589dae74069ef2 (patch) | |
| tree | 0b9ded98468c3dda63c5731d412f0592946ee880 /Modules/Compiler | |
| parent | fe9cddf181dbdc012127de04f5905d62c0d407bb (diff) | |
| download | CMake-6a66bb13ed80398d908bc07a89589dae74069ef2.zip CMake-6a66bb13ed80398d908bc07a89589dae74069ef2.tar.gz CMake-6a66bb13ed80398d908bc07a89589dae74069ef2.tar.bz2 | |
Compiler/TI: Add std options for C++14
The TI compiler does either support C++98 or C++14,
but not both at the same time.
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/TI-CXX.cmake | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/Modules/Compiler/TI-CXX.cmake b/Modules/Compiler/TI-CXX.cmake index 39e37f6..4b6efcd 100644 --- a/Modules/Compiler/TI-CXX.cmake +++ b/Modules/Compiler/TI-CXX.cmake @@ -5,15 +5,18 @@ __compiler_ti(CXX) if("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM") set(__COMPILER_TI_CXX03_VERSION 5.2) + set(__COMPILER_TI_CXX14_VERSION 18.1) elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "MSP430") set(__COMPILER_TI_CXX03_VERSION 4.4) + set(__COMPILER_TI_CXX14_VERSION 18.1) elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "TMS320C28x") set(__COMPILER_TI_CXX03_VERSION 16.9) elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "TMS320C6x") set(__COMPILER_TI_CXX03_VERSION 8.1) + set(__COMPILER_TI_CXX14_VERSION 8.3) else() # architecture not handled @@ -22,7 +25,22 @@ else() endif() -if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "${__COMPILER_TI_CXX03_VERSION}") +if(DEFINED __COMPILER_TI_CXX14_VERSION AND + CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "${__COMPILER_TI_CXX14_VERSION}") + + # C++03 is not supported anymore + set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "--strict_ansi") + set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "--relaxed_ansi") + + # C++11 was never supported + set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "--strict_ansi") + set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "--relaxed_ansi") + + set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "--c++14" "--strict_ansi") + set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "--c++14" "--relaxed_ansi") + + +elseif(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "${__COMPILER_TI_CXX03_VERSION}") set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "--c++03" "--strict_ansi") set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "--c++03" "--relaxed_ansi") @@ -39,15 +57,15 @@ endif() # CXX98 versions: https://processors.wiki.ti.com/index.php/C%2B%2B_Support_in_TI_Compilers if("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM") - __compiler_check_default_language_standard(CXX 4.5 98) + __compiler_check_default_language_standard(CXX 4.5 98 ${__COMPILER_TI_CXX14_VERSION} 14) elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "MSP430") - __compiler_check_default_language_standard(CXX 3.0 98) + __compiler_check_default_language_standard(CXX 3.0 98 ${__COMPILER_TI_CXX14_VERSION} 14) elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "TMS320C28x") __compiler_check_default_language_standard(CXX 5.1 98) elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "TMS320C6x") - __compiler_check_default_language_standard(CXX 6.1 98) + __compiler_check_default_language_standard(CXX 6.1 98 ${__COMPILER_TI_CXX14_VERSION} 14) endif() |