[Cmake-commits] CMake branch, master, updated. v3.11.1-551-gf6da392
Kitware Robot
kwrobot at kitware.com
Fri Apr 20 07:15:05 EDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via f6da39260931e1d4fb3f92d417c3fbbbe4a6bdc1 (commit)
via 1121be24cc73c8ab006e45e7c38564e8ee6a7436 (commit)
via 0055d506671271d2930e91580ca99b34220db8a3 (commit)
via 63e0c16e3de5d3524a409a73ac430109416050de (commit)
via 8acf46caf11c037c76a221ec0b32803f75b03275 (commit)
via 7e532abc78ddd44cfd2e2ee3fd54e332f7a0e84d (commit)
from 38d854dccff6ddeb69c217252dd9ed9f87fe1b19 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6da39260931e1d4fb3f92d417c3fbbbe4a6bdc1
commit f6da39260931e1d4fb3f92d417c3fbbbe4a6bdc1
Merge: 1121be2 0055d50
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 20 11:10:48 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Apr 20 07:10:52 2018 -0400
Merge topic 'doc-drop-faq'
0055d50667 Help: Drop direct link to Wiki/FAQ page
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1986
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1121be24cc73c8ab006e45e7c38564e8ee6a7436
commit 1121be24cc73c8ab006e45e7c38564e8ee6a7436
Merge: 38d854d 63e0c16
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Fri Apr 20 11:06:40 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Apr 20 07:06:55 2018 -0400
Merge topic 'doc-xref-envvar'
63e0c16e3d Help: Link from CMAKE_<LANG>_FLAGS to <LANG>FLAGS environment variables
8acf46caf1 Utilities/Sphinx: Add role and directive for 'envvar' in CMake domain
7e532abc78 Utilities/Sphinx: Fix QtHelp generator identifiers
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Robert Maynard <robert.maynard at kitware.com>
Merge-request: !1985
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0055d506671271d2930e91580ca99b34220db8a3
commit 0055d506671271d2930e91580ca99b34220db8a3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 19 11:39:20 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 19 11:44:22 2018 -0400
Help: Drop direct link to Wiki/FAQ page
Instead mention that community resources are available on the general
documentation landing page.
diff --git a/Help/manual/LINKS.txt b/Help/manual/LINKS.txt
index 3993ff8..8e53c0c 100644
--- a/Help/manual/LINKS.txt
+++ b/Help/manual/LINKS.txt
@@ -5,15 +5,11 @@ Home Page
The primary starting point for learning about CMake.
-Frequently Asked Questions
- https://cmake.org/Wiki/CMake_FAQ
-
- A Wiki is provided containing answers to frequently asked questions.
-
-Online Documentation
+Online Documentation and Community Resources
https://cmake.org/documentation
- Links to available documentation may be found on this web page.
+ Links to available documentation and community resources may be
+ found on this web page.
Mailing List
https://cmake.org/mailing-lists
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63e0c16e3de5d3524a409a73ac430109416050de
commit 63e0c16e3de5d3524a409a73ac430109416050de
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 19 08:57:03 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 19 09:03:32 2018 -0400
Help: Link from CMAKE_<LANG>_FLAGS to <LANG>FLAGS environment variables
diff --git a/Help/variable/CMAKE_LANG_FLAGS.rst b/Help/variable/CMAKE_LANG_FLAGS.rst
index c57d92c..14b2694 100644
--- a/Help/variable/CMAKE_LANG_FLAGS.rst
+++ b/Help/variable/CMAKE_LANG_FLAGS.rst
@@ -4,3 +4,14 @@ CMAKE_<LANG>_FLAGS
Flags for all build types.
``<LANG>`` flags used regardless of the value of :variable:`CMAKE_BUILD_TYPE`.
+
+This is initialized for each language from environment variables:
+
+* ``CMAKE_C_FLAGS``:
+ Initialized by the :envvar:`CFLAGS` environment variable.
+* ``CMAKE_CXX_FLAGS``:
+ Initialized by the :envvar:`CXXFLAGS` environment variable.
+* ``CMAKE_CUDA_FLAGS``:
+ Initialized by the :envvar:`CUDAFLAGS` environment variable.
+* ``CMAKE_Fortran_FLAGS``:
+ Initialized by the :envvar:`FFLAGS` environment variable.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8acf46caf11c037c76a221ec0b32803f75b03275
commit 8acf46caf11c037c76a221ec0b32803f75b03275
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 19 08:50:06 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 19 09:02:44 2018 -0400
Utilities/Sphinx: Add role and directive for 'envvar' in CMake domain
This enables cross-reference syntax for CMake environment variables:
:envvar:`SOMEVAR`
and definition of CMake environment variables via a directive:
.. envvar:: SOMEVAR
It also adds environment variables defined by the directive and by
`Help/envvar/SOMEVAR.rst` documents to the index.
This `envvar` role and directive is defined in our `cmake` domain
and overrides the equivalent `envvar` role and directive provided
by Sphinx in its default domain. This is okay because we build
CMake documents in the `cmakd` domain.
This follows up the work from commit v3.10.0-rc1~43^2 (Help: Document
CMake's environment variables, 2017-09-01) that originally added
`envvar` documentation.
diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py
index cfda2d4..90ddd36 100644
--- a/Utilities/Sphinx/cmake.py
+++ b/Utilities/Sphinx/cmake.py
@@ -144,6 +144,7 @@ class _cmake_index_entry:
_cmake_index_objs = {
'command': _cmake_index_entry('command'),
+ 'envvar': _cmake_index_entry('envvar'),
'generator': _cmake_index_entry('generator'),
'manual': _cmake_index_entry('manual'),
'module': _cmake_index_entry('module'),
@@ -324,6 +325,7 @@ class CMakeDomain(Domain):
label = 'CMake'
object_types = {
'command': ObjType('command', 'command'),
+ 'envvar': ObjType('envvar', 'envvar'),
'generator': ObjType('generator', 'generator'),
'variable': ObjType('variable', 'variable'),
'module': ObjType('module', 'module'),
@@ -339,6 +341,7 @@ class CMakeDomain(Domain):
}
directives = {
'command': CMakeObject,
+ 'envvar': CMakeObject,
'variable': CMakeObject,
# Other object types cannot be created except by the CMakeTransform
# 'generator': CMakeObject,
@@ -355,6 +358,7 @@ class CMakeDomain(Domain):
}
roles = {
'command': CMakeXRefRole(fix_parens = True, lowercase = True),
+ 'envvar': CMakeXRefRole(),
'generator': CMakeXRefRole(),
'variable': CMakeXRefRole(),
'module': CMakeXRefRole(),
diff --git a/Utilities/Sphinx/create_identifiers.py b/Utilities/Sphinx/create_identifiers.py
index 4513434..e638950 100755
--- a/Utilities/Sphinx/create_identifiers.py
+++ b/Utilities/Sphinx/create_identifiers.py
@@ -21,6 +21,7 @@ newlines = []
for line in lines:
mapping = (("command", "command"),
+ ("envvar", "envvar"),
("variable", "variable"),
("generator", "generator"),
("target property", "prop_tgt"),
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e532abc78ddd44cfd2e2ee3fd54e332f7a0e84d
commit 7e532abc78ddd44cfd2e2ee3fd54e332f7a0e84d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 19 08:48:28 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 19 08:48:28 2018 -0400
Utilities/Sphinx: Fix QtHelp generator identifiers
Add missinge entry in `create_identifiers.py` helper.
diff --git a/Utilities/Sphinx/create_identifiers.py b/Utilities/Sphinx/create_identifiers.py
index 3fe3fcb..4513434 100755
--- a/Utilities/Sphinx/create_identifiers.py
+++ b/Utilities/Sphinx/create_identifiers.py
@@ -22,6 +22,7 @@ for line in lines:
mapping = (("command", "command"),
("variable", "variable"),
+ ("generator", "generator"),
("target property", "prop_tgt"),
("test property", "prop_test"),
("source file property", "prop_sf"),
-----------------------------------------------------------------------
Summary of changes:
Help/manual/LINKS.txt | 10 +++-------
Help/variable/CMAKE_LANG_FLAGS.rst | 11 +++++++++++
Utilities/Sphinx/cmake.py | 4 ++++
Utilities/Sphinx/create_identifiers.py | 2 ++
4 files changed, 20 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list