diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-05 14:55:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-05 14:55:33 (GMT) |
| commit | e319a3e1e587d3e49afa4efc0addb4cf3155ed55 (patch) | |
| tree | bf81a06d81120c9c628ca2c75bf188c95b37c9b2 /Help | |
| parent | 2db73edc5cdaed0b426fb315097d34bc9bfc063b (diff) | |
| parent | 7eef823e14e98fc003931ec426fee3033e83381e (diff) | |
| download | CMake-e319a3e1e587d3e49afa4efc0addb4cf3155ed55.zip CMake-e319a3e1e587d3e49afa4efc0addb4cf3155ed55.tar.gz CMake-e319a3e1e587d3e49afa4efc0addb4cf3155ed55.tar.bz2 | |
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.
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/ctest_build.rst | 2 | ||||
| -rw-r--r-- | Help/command/file.rst | 2 | ||||
| -rw-r--r-- | Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Help/command/ctest_build.rst b/Help/command/ctest_build.rst index 1347b42..4a95cdd 100644 --- a/Help/command/ctest_build.rst +++ b/Help/command/ctest_build.rst @@ -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 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 used to trigger a parallel build using the -j option of make. See :module:`ProcessorCount` for an example. diff --git a/Help/command/file.rst b/Help/command/file.rst index 14ca20c..869350a 100644 --- a/Help/command/file.rst +++ b/Help/command/file.rst @@ -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 ``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. ------------------------------------------------------------------------------ diff --git a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst index cf35467..bdeabdb 100644 --- a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst +++ b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst @@ -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 ``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 |