Browse Source

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 <[email protected]>
Merge-request: !5857
Brad King 4 years ago
parent
commit
60280f0d99
2 changed files with 4 additions and 0 deletions
  1. 2 0
      Help/manual/cmake-compile-features.7.rst
  2. 2 0
      Modules/Compiler/PGI-CXX.cmake

+ 2 - 0
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+.

+ 2 - 0
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)