summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-06-23 14:43:47 (GMT)
committerBrad King <brad.king@kitware.com>2023-06-23 14:43:47 (GMT)
commit8c5905ca1cafdcc43e6996df32e145454629324b (patch)
treeb66b6c054cdc4c6bb0dea751e4e3cf665bded82e
parent4902fe086be3599c1198d81f32384fa86a98bff0 (diff)
parent9dd2dd5b778cdc57deaaa7ea90321a8d3aa4edb1 (diff)
downloadCMake-8c5905ca1cafdcc43e6996df32e145454629324b.zip
CMake-8c5905ca1cafdcc43e6996df32e145454629324b.tar.gz
CMake-8c5905ca1cafdcc43e6996df32e145454629324b.tar.bz2
Merge branch 'doc-project-none' into release-3.26
Merge-request: !8585
-rw-r--r--Help/command/enable_language.rst4
-rw-r--r--Help/command/project.rst3
2 files changed, 3 insertions, 4 deletions
diff --git a/Help/command/enable_language.rst b/Help/command/enable_language.rst
index 21b38ba..2f1cc23 100644
--- a/Help/command/enable_language.rst
+++ b/Help/command/enable_language.rst
@@ -13,10 +13,6 @@ variables that are created by the project command.
.. include:: SUPPORTED_LANGUAGES.txt
-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.
-
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
targets using the named language directly for compiling sources or
diff --git a/Help/command/project.rst b/Help/command/project.rst
index ab93f3d..d695789 100644
--- a/Help/command/project.rst
+++ b/Help/command/project.rst
@@ -105,6 +105,9 @@ The options are:
.. include:: SUPPORTED_LANGUAGES.txt
+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.
The variables set through the ``VERSION``, ``DESCRIPTION`` and ``HOMEPAGE_URL``
options are intended for use as default values in package metadata and documentation.