diff options
| -rw-r--r-- | Help/command/enable_language.rst | 4 | ||||
| -rw-r--r-- | Help/command/project.rst | 3 | ||||
| -rw-r--r-- | Help/prop_sf/GENERATED.rst | 2 | ||||
| -rw-r--r-- | Utilities/Sphinx/cmake.py | 16 |
4 files changed, 19 insertions, 6 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. diff --git a/Help/prop_sf/GENERATED.rst b/Help/prop_sf/GENERATED.rst index 216dfe8..5ecc86c 100644 --- a/Help/prop_sf/GENERATED.rst +++ b/Help/prop_sf/GENERATED.rst @@ -14,7 +14,7 @@ validity checks. Any file that is - created by the execution of commands such as - :command:`add_custom_command` and :command:`file(GENERATE)` + :command:`add_custom_command` which run during the build - listed as one of the ``BYPRODUCTS`` of an :command:`add_custom_command` or :command:`add_custom_target` command, or - created by a CMake ``AUTOGEN`` operation such as :prop_tgt:`AUTOMOC`, diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py index da2609a..60bfb33 100644 --- a/Utilities/Sphinx/cmake.py +++ b/Utilities/Sphinx/cmake.py @@ -679,7 +679,7 @@ class CMakeDomain(Domain): 'manual': CMakeXRefRole(), } initial_data = { - 'objects': {}, # fullname -> docname, objtype + 'objects': {}, # fullname -> ObjectEntry } def clear_doc(self, docname): @@ -690,6 +690,20 @@ class CMakeDomain(Domain): for fullname in to_clear: del self.data['objects'][fullname] + def merge_domaindata(self, docnames, otherdata): + """Merge domaindata from the workers/chunks when they return. + + Called once per parallelization chunk. + Only used when sphinx is run in parallel mode. + + :param docnames: a Set of the docnames that are part of the current + chunk to merge + :param otherdata: the partial data calculated by the current chunk + """ + for refname, obj in otherdata['objects'].items(): + if obj.docname in docnames: + self.data['objects'][refname] = obj + def resolve_xref(self, env, fromdocname, builder, typ, target, node, contnode): targetid = f'{typ}:{target}' |