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 1fda77d45565c3a819e6149597c3a194d9ccd0bb (commit)
via 41be8a739e862995e56aad33e2383c2278a91b77 (commit)
via 4bf96ed9b01a31e0c91e101b913fa5eb64b99432 (commit)
via 9eaf0fea2824b2e0b767915dec25deed9552905a (commit)
via 9b9a57e16b22769b612d4bbe45e9b7cb936be690 (commit)
via 916b7d519557d4d11e73e66c3e9c95cdacb655ba (commit)
via e7730d78b44ca90aa8ee6d1f34495cd416888bce (commit)
via 9a34e95a41fff294a7fcd452cb3e78fd4ff021aa (commit)
via 58f47448210bf3fd3121bf91f74eb893ba9d034c (commit)
from fc58819150a126d87bf17ad812bb6f62f28ae42b (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=1fda77d45565c3a819e6149597c3a194d9ccd0bb
commit 1fda77d45565c3a819e6149597c3a194d9ccd0bb
Merge: 41be8a7 9b9a57e
Author: Brad King
AuthorDate: Mon Jul 10 10:23:56 2017 -0400
Commit: Brad King
CommitDate: Mon Jul 10 10:23:56 2017 -0400
Merge branch 'release-3.9'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41be8a739e862995e56aad33e2383c2278a91b77
commit 41be8a739e862995e56aad33e2383c2278a91b77
Merge: 4bf96ed 9a34e95
Author: Brad King
AuthorDate: Mon Jul 10 14:21:47 2017 +
Commit: Kitware Robot
CommitDate: Mon Jul 10 10:22:00 2017 -0400
Merge topic 'autogen-no-generated-files'
9a34e95a Autogen: Skip generated files for compatibility with CMake 3.8
Acked-by: Kitware Robot
Merge-request: !1033
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bf96ed9b01a31e0c91e101b913fa5eb64b99432
commit 4bf96ed9b01a31e0c91e101b913fa5eb64b99432
Merge: 9eaf0fe e7730d7
Author: Brad King
AuthorDate: Mon Jul 10 14:21:12 2017 +
Commit: Kitware Robot
CommitDate: Mon Jul 10 10:21:23 2017 -0400
Merge topic 'find_package-restore-considered-configs'
e7730d78 find_package: Restore longer message when config files were
considered
Acked-by: Kitware Robot
Merge-request: !1032
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9eaf0fea2824b2e0b767915dec25deed9552905a
commit 9eaf0fea2824b2e0b767915dec25deed9552905a
Merge: fc58819 58f4744
Author: Brad King
AuthorDate: Mon Jul 10 14:20:26 2017 +
Commit: Kitware Robot
CommitDate: Mon Jul 10 10:21:00 2017 -0400
Merge topic 'indented_cmakedefine'
58f47448 configure_file: Add support for indented cmakedefine
Acked-by: Kitware Robot
Merge-request: !1024
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58f47448210bf3fd3121bf91f74eb893ba9d034c
commit 58f47448210bf3fd3121bf91f74eb893ba9d034c
Author: Sylvain Joubert
AuthorDate: Tue Jul 4 12:00:02 2017 +0200
Commit: Sylvain Joubert
CommitDate: Tue Jul 4 12:00:02 2017 +0200
configure_file: Add support for indented cmakedefine
Optional spaces and/or tabs are now understood between the '#' character
and the 'cmakedefine'/'cmakedefine01' words. This indentation is
preserved in the output lines.
Fixes: #13037
diff --git a/Help/command/configure_file.rst b/Help/command/configure_file.rst
index 4304f09..75ec441 100644
--- a/Help/command/configure_file.rst
+++ b/Help/command/configure_file.rst
@@ -30,6 +30,18 @@ a false constant by the :command:`if` command. The "..."
content on the
line after the variable name, if any, is processed as above.
Input file lines of the form ``#cmakedefine01 VAR`` will be replaced with
either ``#define VAR 1`` or ``#define VAR 0`` similarly.
+The result lines (with the exception of the ``#undef`` comments) can be
+indented using spaces and/or tabs between the ``#`` character
+and the ``cmakedefine`` or ``cmakedefine01`` words. This whitespace
+indentation will be preserved in the output lines::
+
+ # cmakedefine VAR
+ # cmakedefine01 VAR
+
+will be replaced, if ``VAR`` is defined, with::
+
+ # define VAR
+ # define VAR 1
If the input file is modified the build system will re-run CMake to
re-configure the file and generate the build system again.
diff --git a/Help/release/dev/indented_cmakedefine.rst
b/Help/release/dev/indented_cmakedefine.rst
new file mode 100644
index 000..fd28b25
--- /dev/null
+++ b/Help/release/dev/indented_cmakedefine.rst
@@ -0,0 +1,7 @@
+indented_cmakedefine
+
+
+* The :command:`configure_file` command