Skip to content

Commit efc76a7

Browse files
Merge branch '63-merge-tpls-packages-3' (#63)
Just some documentation updates.
2 parents 45de7f0 + 2071ddd commit efc76a7

4 files changed

+53
-22
lines changed

tribits/core/package_arch/TribitsProcessPackagesAndDirsLists.cmake

+7-5
Original file line numberDiff line numberDiff line change
@@ -381,20 +381,22 @@ endfunction()
381381
# ${PROJECT_NAME}_REVERSE_PACKAGES
382382
#
383383
# For each of the listed top-level (parent) packages ${PACKAGE_NAME}, it also
384-
# sets up constant variables like:
384+
# sets up constant variables defined in `TriBITS Package Top-Level Local
385+
# Variables`_ like:
385386
#
386387
# * `${PACKAGE_NAME}_SOURCE_DIR`_
387388
# * `${PACKAGE_NAME}_REL_SOURCE_DIR`_
388389
# * `${PACKAGE_NAME}_TESTGROUP`_
389390
#
390-
# and sets up some standard enable/diable vars with default values like:
391+
# and sets up some standard enable/diable vars with default values as defined
392+
# in `TriBITS Package Cache Variables`_ like::
391393
#
392394
# ${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}
393395
#
394-
# NOTE: Set TRIBITS_PROCESS_PACKAGES_AND_DIRS_LISTS_VERBOSE=TRUE to see really
395-
# verbose debug ouptut from this macro.
396+
# NOTE: Set ``TRIBITS_PROCESS_PACKAGES_AND_DIRS_LISTS_VERBOSE=TRUE`` to see
397+
# really verbose debug ouptut from this macro.
396398
#
397-
# See `Function call tree for constructing package dependency graph`_
399+
# See `Function call tree for constructing package dependency graph`_.
398400
#
399401
macro(tribits_process_packages_and_dirs_lists REPOSITORY_NAME REPOSITORY_DIR)
400402

tribits/core/package_arch/TribitsReadAllProjectDepsFilesCreateDepsGraph.cmake

+9-3
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,16 @@ include(TimingUtils)
5959
# and TPLs and creates the packages dependency graph.
6060
#
6161
# On output, this creates all of the package lists and dependency
62-
# data-structures described in `TriBITS System Data Structures and
63-
# Functions`_.
62+
# data-structures described in the section `TriBITS System Data Structures`_
63+
# and more specifically the sections:
6464
#
65-
# See `Function call tree for constructing package dependency graph`_
65+
# * `Lists of external and internal packages`_
66+
# * `List variables defining the package dependencies graph`_
67+
# * `TriBITS Package Top-Level Local Variables`_
68+
# * `TriBITS Subpackage Top-Level Local Variables`_
69+
# * `TriBITS Package Cache Variables`_
70+
#
71+
# See `Function call tree for constructing package dependency graph`_.
6672
#
6773
macro(tribits_read_all_project_deps_files_create_deps_graph)
6874

tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
TriBITS System Data Structures and Functions
2-
--------------------------------------------
1+
TriBITS System Data Structures
2+
------------------------------
33

44
This section describes the global CMake variables that make up the
55
data-structures and the functions that create them that define the TriBITS
@@ -10,6 +10,13 @@ graph of external packages (i.e. TPLs) and internal packages (i.e. buildable
1010
CMake packages). This information is meant for maintainers of the TriBITS
1111
system itself and should not need to be known by TriBITS Project maintainers.
1212

13+
In addition to the variables listed below are the variables documented in:
14+
15+
* `TriBITS Project Core Variables`_
16+
* `TriBITS Repository Core Variables`_
17+
* `TriBITS Package Core Variables`_
18+
* `TriBITS Subpackage Core Variables`_
19+
1320

1421
Lists of external and internal packages
1522
+++++++++++++++++++++++++++++++++++++++

tribits/doc/developers_guide/TribitsDevelopersGuide.rst

+28-12
Original file line numberDiff line numberDiff line change
@@ -1748,7 +1748,7 @@ A packages' core variables are broken down into the following categories:
17481748

17491749
.. _TriBITS Package Local Variables:
17501750

1751-
The following locally scoped *TriBITS Package Local Variables* are defined
1751+
The following locally scoped **TriBITS Package Local Variables** are defined
17521752
when the files for a given TriBITS Package (or any SE package for that matter)
17531753
are being processed:
17541754

@@ -1777,7 +1777,7 @@ are being processed:
17771777
.. _TriBITS Package Top-Level Local Variables:
17781778

17791779
Once all of the TriBITS SE package's ``Dependencies.cmake`` files have been
1780-
processed, the following *TriBITS Package Top-Level Local Variables* are
1780+
processed, the following **TriBITS Package Top-Level Local Variables** are
17811781
defined:
17821782

17831783
.. _${PACKAGE_NAME}_SOURCE_DIR:
@@ -1830,7 +1830,7 @@ defined:
18301830

18311831
.. _TriBITS Package Cache Variables:
18321832

1833-
In addition, the following user-settable *TriBITS Package Cache Variables* are
1833+
In addition, the following user-settable **TriBITS Package Cache Variables** are
18341834
defined before a (SE) Package's ``CMakeLists.txt`` file is processed:
18351835

18361836
.. _${PROJECT_NAME}_ENABLE_${PACKAGE_NAME}:
@@ -1897,7 +1897,7 @@ Logic`_.
18971897

18981898
.. _TriBITS Package Optional Dependency Macro Variables:
18991899

1900-
The following local *TriBITS Package Optional Dependency Macro Variables* are
1900+
The following local **TriBITS Package Optional Dependency Macro Variables** are
19011901
defined in the top-level project scope before a (SE) Package's
19021902
``CMakeLists.txt`` file is processed:
19031903

@@ -2126,17 +2126,19 @@ TriBITS Subpackage Core Variables
21262126
.................................
21272127

21282128
The core variables associated with a subpackage are identical to the `TriBITS
2129-
Package Core Variables`_. The only difference is that a subpackage may need
2130-
to refer to its parent package where a top-level package does not have a
2131-
parent package. The extra variables that are defined when processing a
2132-
subpackage's files are:
2129+
Package Core Variables`_. In addition, a subpackage may need to refer to its
2130+
top-level parent package where a top-level package does not have a parent
2131+
package. These additional variables that are defined for subpackages are
2132+
broken down into the following categories:
21332133

2134-
.. _${PACKAGE_NAME}_PARENT_PACKAGE:
2134+
* `TriBITS Subpackage Local Variables`_
2135+
* `TriBITS Subpackage Top-Level Local Variables`_
21352136

2136-
``${PACKAGE_NAME}_PARENT_PACKAGE``
2137+
.. _TriBITS Subpackage Local Variables:
21372138

2138-
The name of the parent package. (NOTE: If this is empty "", then
2139-
``${PACKAGE_NAME}`` is actually a parent package and not a subpackage.)
2139+
In addition to the `TriBITS Package Local Variables`_, the following locally
2140+
scoped **TriBITS Subpackage Local Variables** are defined when the files for a
2141+
given TriBITS Subpackage are being processed:
21402142

21412143
.. _PARENT_PACKAGE_NAME:
21422144

@@ -2153,6 +2155,20 @@ subpackage's files are:
21532155
The absolute path to the parent package's base binary directory.
21542156

21552157

2158+
.. _TriBITS Subpackage Top-Level Local Variables:
2159+
2160+
In addition to the `TriBITS Package Top-Level Local Variables`_, once all of a
2161+
TriBITS subpackage's ``Dependencies.cmake`` files have been processed, the
2162+
following **TriBITS Subpackage Top-Level Local Variables** are defined:
2163+
2164+
.. _${PACKAGE_NAME}_PARENT_PACKAGE:
2165+
2166+
``${PACKAGE_NAME}_PARENT_PACKAGE``
2167+
2168+
The name of the parent package. (NOTE: If this is empty "", then
2169+
``${PACKAGE_NAME}`` is actually a parent package and not a subpackage.)
2170+
2171+
21562172
How is a TriBITS Subpackage different from a TriBITS Package?
21572173
.............................................................
21582174

0 commit comments

Comments
 (0)