diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-08 13:32:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-08 13:33:50 (GMT) |
| commit | a5ab4c741fb1edce6191871368cda9ddfd6cd50f (patch) | |
| tree | 690b58de4fdee96e2a23b16fe86512b29e38829e | |
| parent | 0d999978d25a2edb14d9416ae5b45669040c591d (diff) | |
| parent | d69b46bf01f30fdd8a1484c36bc159617df97b62 (diff) | |
| download | CMake-a5ab4c741fb1edce6191871368cda9ddfd6cd50f.zip CMake-a5ab4c741fb1edce6191871368cda9ddfd6cd50f.tar.gz CMake-a5ab4c741fb1edce6191871368cda9ddfd6cd50f.tar.bz2 | |
Merge topic 'doc-lang-std' into release-3.21
d69b46bf01 Help: Document when CUDA_STANDARD values were added
bdb59839b9 Help: Document when OBJCXX_STANDARD values were added
627aca946b Help: Document when OBJC_STANDARD values as definition list
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6321
| -rw-r--r-- | Help/prop_tgt/CUDA_STANDARD.rst | 24 | ||||
| -rw-r--r-- | Help/prop_tgt/OBJCXX_STANDARD.rst | 22 | ||||
| -rw-r--r-- | Help/prop_tgt/OBJC_STANDARD.rst | 11 |
3 files changed, 54 insertions, 3 deletions
diff --git a/Help/prop_tgt/CUDA_STANDARD.rst b/Help/prop_tgt/CUDA_STANDARD.rst index 6517035..5ef57be 100644 --- a/Help/prop_tgt/CUDA_STANDARD.rst +++ b/Help/prop_tgt/CUDA_STANDARD.rst @@ -9,7 +9,29 @@ This property specifies the CUDA/C++ standard whose features are requested to build this target. For some compilers, this results in adding a flag such as ``-std=gnu++11`` to the compile line. -Supported values are ``98``, ``03``, ``11``, ``14``, ``17``, ``20``, ``23``. +Supported values are: + +``98`` + CUDA C++98 + +``11`` + CUDA C++11 + +``14`` + CUDA C++14 + +``17`` + CUDA C++17 + +``20`` + .. versionadded:: 3.12 + + CUDA C++20 + +``23`` + .. versionadded:: 3.20 + + CUDA C++23 If the value requested does not result in a compile flag being added for the compiler in use, a previous standard flag will be added instead. This diff --git a/Help/prop_tgt/OBJCXX_STANDARD.rst b/Help/prop_tgt/OBJCXX_STANDARD.rst index 96088af..654e687 100644 --- a/Help/prop_tgt/OBJCXX_STANDARD.rst +++ b/Help/prop_tgt/OBJCXX_STANDARD.rst @@ -9,7 +9,27 @@ This property specifies the ObjC++ standard whose features are requested to build this target. For some compilers, this results in adding a flag such as ``-std=gnu++11`` to the compile line. -Supported values are ``98``, ``11``, ``14``, ``17``, ``20``, ``23``. +Supported values are: + +``98`` + Objective C++98 + +``11`` + Objective C++11 + +``14`` + Objective C++14 + +``17`` + Objective C++17 + +``20`` + Objective C++20 + +``23`` + .. versionadded:: 3.20 + + Objective C++23 If the value requested does not result in a compile flag being added for the compiler in use, a previous standard flag will be added instead. This diff --git a/Help/prop_tgt/OBJC_STANDARD.rst b/Help/prop_tgt/OBJC_STANDARD.rst index 2143ff9..2d27bcf 100644 --- a/Help/prop_tgt/OBJC_STANDARD.rst +++ b/Help/prop_tgt/OBJC_STANDARD.rst @@ -9,7 +9,16 @@ This property specifies the OBJC standard whose features are requested to build this target. For some compilers, this results in adding a flag such as ``-std=gnu11`` to the compile line. -Supported values are ``90``, ``99`` and ``11``. +Supported values are: + +``90`` + Objective C89/C90 + +``99`` + Objective C99 + +``11`` + Objective C11 If the value requested does not result in a compile flag being added for the compiler in use, a previous standard flag will be added instead. This |