diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-25 14:01:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-25 14:02:02 (GMT) |
| commit | 60280f0d991fa42f9c5673e8516ae78d9b0a182a (patch) | |
| tree | e72f1c42531ff259a49afbcd9bb7c685b669a717 | |
| parent | 498b7da2e471fd8ef5a41433505358df4f117044 (diff) | |
| parent | 72efd95add332161471c69a2f688f1ac459e4065 (diff) | |
| download | CMake-60280f0d991fa42f9c5673e8516ae78d9b0a182a.zip CMake-60280f0d991fa42f9c5673e8516ae78d9b0a182a.tar.gz CMake-60280f0d991fa42f9c5673e8516ae78d9b0a182a.tar.bz2 | |
Merge topic 'nvhpc-minor-fixes' into release-3.20
72efd95add PGI: Explicitly specify CMAKE_CXX98_STANDARD_COMPILE_OPTION
6bfb2c6175 HELP: Update compile-features documentation with missing compilers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5857
| -rw-r--r-- | Help/manual/cmake-compile-features.7.rst | 2 | ||||
| -rw-r--r-- | Modules/Compiler/PGI-CXX.cmake | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst index 96ed5a7..0d15ddf 100644 --- a/Help/manual/cmake-compile-features.7.rst +++ b/Help/manual/cmake-compile-features.7.rst @@ -360,6 +360,7 @@ versions specified for each: * ``Cray``: Cray Compiler Environment version 8.1+. * ``PGI``: PGI version 12.10+. +* ``NVHPC``: NVIDIA HPC compilers version 11.0+. * ``TI``: Texas Instruments compiler. * ``XL``: IBM XL version 10.1+. @@ -375,4 +376,5 @@ their associated meta-features (e.g. ``cuda_std_11``) available from the following :variable:`compiler ids <CMAKE_<LANG>_COMPILER_ID>` as of the versions specified for each: +* ``Clang``: Clang compiler 5.0+. * ``NVIDIA``: NVIDIA nvcc compiler 7.5+. diff --git a/Modules/Compiler/PGI-CXX.cmake b/Modules/Compiler/PGI-CXX.cmake index 3254353..1279c19 100644 --- a/Modules/Compiler/PGI-CXX.cmake +++ b/Modules/Compiler/PGI-CXX.cmake @@ -8,6 +8,8 @@ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.10) set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION --gnu_extensions) set(CMAKE_CXX98_STANDARD__HAS_FULL_SUPPORT ON) if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.10) + set(CMAKE_CXX98_STANDARD_COMPILE_OPTION --c++03) + set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION --c++03 --gnu_extensions) set(CMAKE_CXX11_STANDARD_COMPILE_OPTION --c++11) set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION --c++11 --gnu_extensions) set(CMAKE_CXX11_STANDARD__HAS_FULL_SUPPORT ON) |