diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-09 13:36:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-09 13:36:58 (GMT) |
| commit | b5c4b70290a410feb0c53d0775118cd7b20681c8 (patch) | |
| tree | ec4c764546c90f094cb1ae049fdb1efcde9d1a13 /Modules | |
| parent | 86633cc203d58090b11e8d67aa47777575084292 (diff) | |
| parent | 9ac426e46075871a283e6b2afdeb3792a70e5744 (diff) | |
| download | CMake-b5c4b70290a410feb0c53d0775118cd7b20681c8.zip CMake-b5c4b70290a410feb0c53d0775118cd7b20681c8.tar.gz CMake-b5c4b70290a410feb0c53d0775118cd7b20681c8.tar.bz2 | |
Merge topic 'nvhpc_support_new_c_and_c++_standards' into release-3.21
9ac426e460 NVHPC-C: Add support for C17
f5dbc27c27 NVHPC-CXX: Add support for C++20
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !6430
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Compiler/NVHPC-C.cmake | 5 | ||||
| -rw-r--r-- | Modules/Compiler/NVHPC-CXX.cmake | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Modules/Compiler/NVHPC-C.cmake b/Modules/Compiler/NVHPC-C.cmake index 72c2656..e37aad5 100644 --- a/Modules/Compiler/NVHPC-C.cmake +++ b/Modules/Compiler/NVHPC-C.cmake @@ -4,4 +4,9 @@ include(Compiler/NVHPC) # Needed so that we support `LANGUAGE` property correctly set(CMAKE_C_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -x c) +if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 20.11) + set(CMAKE_C17_STANDARD_COMPILE_OPTION -std=c17) + set(CMAKE_C17_EXTENSION_COMPILE_OPTION -std=gnu17) +endif() + __compiler_nvhpc(C) diff --git a/Modules/Compiler/NVHPC-CXX.cmake b/Modules/Compiler/NVHPC-CXX.cmake index ac75b53..534e822 100644 --- a/Modules/Compiler/NVHPC-CXX.cmake +++ b/Modules/Compiler/NVHPC-CXX.cmake @@ -4,4 +4,9 @@ include(Compiler/NVHPC) # Needed so that we support `LANGUAGE` property correctly set(CMAKE_CXX_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -x c++) +if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 20.11) + set(CMAKE_CXX20_STANDARD_COMPILE_OPTION -std=c++20) + set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION -std=gnu++20) +endif() + __compiler_nvhpc(CXX) |