diff options
author | Robert Maynard <robert.maynard@kitware.com> | 2016-12-02 21:56:12 (GMT) |
---|---|---|
committer | Robert Maynard <robert.maynard@kitware.com> | 2016-12-12 19:39:32 (GMT) |
commit | 1371eec4c38b0a3b83f1416774c6c213ad0db6fc (patch) | |
tree | 7cdc524fe87bc18ddeb67f923f639881e1f0c07e /Help | |
parent | 3d3d3f94703e23d3d2cbff67537057474e3e0ff1 (diff) | |
download | CMake-1371eec4c38b0a3b83f1416774c6c213ad0db6fc.zip CMake-1371eec4c38b0a3b83f1416774c6c213ad0db6fc.tar.gz CMake-1371eec4c38b0a3b83f1416774c6c213ad0db6fc.tar.bz2 |
try_compile: extend CMP0067 to honor language standards for CUDA.
Diffstat (limited to 'Help')
-rw-r--r-- | Help/command/try_compile.rst | 16 | ||||
-rw-r--r-- | Help/policy/CMP0067.rst | 5 |
2 files changed, 14 insertions, 7 deletions
diff --git a/Help/command/try_compile.rst b/Help/command/try_compile.rst index cde3776..66ea3d7 100644 --- a/Help/command/try_compile.rst +++ b/Help/command/try_compile.rst @@ -87,16 +87,17 @@ The options are: Store the output from the build process the given variable. ``<LANG>_STANDARD <std>`` - Specify the :prop_tgt:`C_STANDARD` or :prop_tgt:`CXX_STANDARD` - target property of the generated project. + Specify the :prop_tgt:`C_STANDARD`, :prop_tgt:`CXX_STANDARD`, + or :prop_tgt:`CUDA_STANDARD` target property of the generated project. ``<LANG>_STANDARD_REQUIRED <bool>`` - Specify the :prop_tgt:`C_STANDARD_REQUIRED` or - :prop_tgt:`CXX_STANDARD_REQUIRED` target property of the generated project. + Specify the :prop_tgt:`C_STANDARD_REQUIRED`, + :prop_tgt:`CXX_STANDARD_REQUIRED`, or :prop_tgt:`CUDA_STANDARD_REQUIRED` + target property of the generated project. ``<LANG>_EXTENSIONS <bool>`` - Specify the :prop_tgt:`C_EXTENSIONS` or :prop_tgt:`CXX_EXTENSIONS` - target property of the generated project. + Specify the :prop_tgt:`C_EXTENSIONS`, :prop_tgt:`CXX_EXTENSIONS`, + or :prop_tgt:`CUDA_EXTENSIONS` target property of the generated project. In this version all files in ``<bindir>/CMakeFiles/CMakeTmp`` will be cleaned automatically. For debugging, ``--debug-trycompile`` can be @@ -146,6 +147,9 @@ then the language standard variables are honored: * :variable:`CMAKE_CXX_STANDARD` * :variable:`CMAKE_CXX_STANDARD_REQUIRED` * :variable:`CMAKE_CXX_EXTENSIONS` +* :variable:`CMAKE_CUDA_STANDARD` +* :variable:`CMAKE_CUDA_STANDARD_REQUIRED` +* :variable:`CMAKE_CUDA_EXTENSIONS` Their values are used to set the corresponding target properties in the generated project (unless overridden by an explicit option). diff --git a/Help/policy/CMP0067.rst b/Help/policy/CMP0067.rst index d52ba7f..e6dda80 100644 --- a/Help/policy/CMP0067.rst +++ b/Help/policy/CMP0067.rst @@ -8,7 +8,7 @@ callers to check whether they will be able to compile a given source file with the current toolchain. In order to match compiler behavior, any language standard mode should match. However, CMake 3.7 and below did not do this. CMake 3.8 and above prefer to honor the language standard settings -for ``C`` and ``CXX`` (C++) using the values of the variables: +for ``C``, ``CXX`` (C++), and ``CUDA`` using the values of the variables: * :variable:`CMAKE_C_STANDARD` * :variable:`CMAKE_C_STANDARD_REQUIRED` @@ -16,6 +16,9 @@ for ``C`` and ``CXX`` (C++) using the values of the variables: * :variable:`CMAKE_CXX_STANDARD` * :variable:`CMAKE_CXX_STANDARD_REQUIRED` * :variable:`CMAKE_CXX_EXTENSIONS` +* :variable:`CMAKE_CUDA_STANDARD` +* :variable:`CMAKE_CUDA_STANDARD_REQUIRED` +* :variable:`CMAKE_CUDA_EXTENSIONS` This policy provides compatibility for projects that do not expect the language standard settings to be used automatically. |