summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-12-06 13:06:30 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-12-06 13:06:33 (GMT)
commitdd792b08b50d17ea4d3ff5ba17bec45550a8ed16 (patch)
tree8c77bc9d36259b19839a98d21b4243e61b854913 /Help
parent060cf73ec8c2d5d73d698b1ff547d425d8ec7eb3 (diff)
parent6ecd8b601b6c09d1f07bf5b2ae0cec694522d2c7 (diff)
downloadCMake-dd792b08b50d17ea4d3ff5ba17bec45550a8ed16.zip
CMake-dd792b08b50d17ea4d3ff5ba17bec45550a8ed16.tar.gz
CMake-dd792b08b50d17ea4d3ff5ba17bec45550a8ed16.tar.bz2
Merge topic 'doc-lang-order'
6ecd8b60 Help: Document that ASM should be enabled last Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1560
Diffstat (limited to 'Help')
-rw-r--r--Help/command/enable_language.rst5
-rw-r--r--Help/command/project.rst6
2 files changed, 9 insertions, 2 deletions
diff --git a/Help/command/enable_language.rst b/Help/command/enable_language.rst
index 871ac4e..61dfc03 100644
--- a/Help/command/enable_language.rst
+++ b/Help/command/enable_language.rst
@@ -10,7 +10,10 @@ Enable a language (CXX/C/Fortran/etc)
This command enables support for the named language in CMake. This is
the same as the project command but does not create any of the extra
variables that are created by the project command. Example languages
-are CXX, C, Fortran.
+are ``CXX``, ``C``, ``CUDA``, ``Fortran``, and ``ASM``.
+
+If enabling ``ASM``, enable it last so that CMake can check whether
+compilers for other languages like ``C`` work for assembly too.
This command must be called in file scope, not in a function call.
Furthermore, it must be called in the highest directory common to all
diff --git a/Help/command/project.rst b/Help/command/project.rst
index 139f69c..eb185e4 100644
--- a/Help/command/project.rst
+++ b/Help/command/project.rst
@@ -46,11 +46,15 @@ variable will be set to its argument. The argument must be a string with short
description of the project (only a few words).
Optionally you can specify which languages your project supports.
-Example languages are ``C``, ``CXX`` (i.e. C++), ``Fortran``, etc.
+Example languages include ``C``, ``CXX`` (i.e. C++), ``CUDA``,
+``Fortran``, and ``ASM``.
By default ``C`` and ``CXX`` are enabled if no language options are
given. Specify language ``NONE``, or use the ``LANGUAGES`` keyword
and list no languages, to skip enabling any languages.
+If enabling ``ASM``, list it last so that CMake can check whether
+compilers for other languages like ``C`` work for assembly too.
+
If a variable exists called :variable:`CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE`,
the file pointed to by that variable will be included as the last step of the
project command.