Commit e319a3e1 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'minor-help-cleanup'

7eef823e Help: Add comma to assist parsing of ctest_build command docs.
5fb9b16d Help: Document that file(GENERATE) re-writes only when needed.
95135ac3 Help: Add missing external link marker.
parents 2db73edc 7eef823e
...@@ -23,7 +23,7 @@ The APPEND option marks results for append to those previously ...@@ -23,7 +23,7 @@ The APPEND option marks results for append to those previously
submitted to a dashboard server since the last ctest_start. Append submitted to a dashboard server since the last ctest_start. Append
semantics are defined by the dashboard server in use. semantics are defined by the dashboard server in use.
If set the contents of the variable CTEST_BUILD_FLAGS are passed as If set, the contents of the variable CTEST_BUILD_FLAGS are passed as
additional arguments to the underlying build command. This can e.g. be additional arguments to the underlying build command. This can e.g. be
used to trigger a parallel build using the -j option of make. See used to trigger a parallel build using the -j option of make. See
:module:`ProcessorCount` for an example. :module:`ProcessorCount` for an example.
...@@ -271,6 +271,8 @@ from the input content to produce the output content. The options are: ...@@ -271,6 +271,8 @@ from the input content to produce the output content. The options are:
Exactly one ``CONTENT`` or ``INPUT`` option must be given. A specific Exactly one ``CONTENT`` or ``INPUT`` option must be given. A specific
``OUTPUT`` file may be named by at most one invocation of ``file(GENERATE)``. ``OUTPUT`` file may be named by at most one invocation of ``file(GENERATE)``.
Generated files are modified on subsequent cmake runs only if their content
is changed.
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
......
...@@ -185,7 +185,7 @@ The features known to this version of CMake are: ...@@ -185,7 +185,7 @@ The features known to this version of CMake are:
.. _N3050: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3050.html .. _N3050: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3050.html
``cxx_nonstatic_member_init`` ``cxx_nonstatic_member_init``
Non-static data member initialization, as defined in N2756. Non-static data member initialization, as defined in N2756_.
.. _N2756: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2756.htm .. _N2756: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2756.htm
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment