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 11897b824cb18f40bcbcee03ab4cb106a10ee436 (commit)
via 920dd9d56bca8f855675ecf65c13059d111c3ec6 (commit)
via 26a0f5d6d428f025f4bfb987d6dc24acb0707aec (commit)
via 81ded33c04e0d7faff55b048877fcd795ce8afe0 (commit)
via fd867a49c4c9563c90bf9ebf66ba602dee072e35 (commit)
via 39fbbd6feaec91bcb2d31ee01ec431d0791a2baf (commit)
from 490da0bd337f33c51884d7fe3bd5ac042ac0b0c5 (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=11897b824cb18f40bcbcee03ab4cb106a10ee436
commit 11897b824cb18f40bcbcee03ab4cb106a10ee436
Merge: 920dd9d56b 81ded33c04
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 24 08:03:40 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Oct 24 08:03:40 2019 -0400
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=920dd9d56bca8f855675ecf65c13059d111c3ec6
commit 920dd9d56bca8f855675ecf65c13059d111c3ec6
Merge: 26a0f5d6d4 fd867a49c4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 24 12:02:23 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Oct 24 08:03:15 2019 -0400
Merge topic 'cmp0097-doc-fix'
fd867a49c4 Help: Fix capitalization in CMP0097 documentation
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3941
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26a0f5d6d428f025f4bfb987d6dc24acb0707aec
commit 26a0f5d6d428f025f4bfb987d6dc24acb0707aec
Merge: 490da0bd33 39fbbd6fea
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 24 12:02:13 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Oct 24 08:02:21 2019 -0400
Merge topic 'fortran-ext-F'
39fbbd6fea Fortran: Add .F extension to Source Files group
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3940
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39fbbd6feaec91bcb2d31ee01ec431d0791a2baf
commit 39fbbd6feaec91bcb2d31ee01ec431d0791a2baf
Author: Johnny Jazeix <jaz...@gmail.com>
AuthorDate: Wed Oct 23 14:47:45 2019 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Oct 23 09:20:25 2019 -0400
Fortran: Add .F extension to Source Files group
While at it, improve source layout of the regex string literal.
Fixes: #8768
diff --git a/Source/cmSourceFile.h b/Source/cmSourceFile.h
index 82a3625b8b..19a0d29136 100644
--- a/Source/cmSourceFile.h
+++ b/Source/cmSourceFile.h
@@ -154,9 +154,8 @@ private:
#define CM_HEADER_REGEX "\\.(h|hh|h\\+\\+|hm|hpp|hxx|in|txx|inl)$"
#define CM_SOURCE_REGEX \
- "\\.(C|M|c|c\\+\\+|cc|cpp|cxx|cu|f|f90|for|fpp|ftn|m|mm|rc|def|r|odl|idl|" \
- "hpj" \
- "|bat)$"
+ "\\.(C|F|M|c|c\\+\\+|cc|cpp|cxx|cu|f|f90|for|fpp|ftn|m|mm|" \
+ "rc|def|r|odl|idl|hpj|bat)$"
#define CM_PCH_REGEX "cmake_pch\\.(h|hxx)$"
-----------------------------------------------------------------------
Summary of changes:
Help/policy/CMP0097.rst | 2 +-
Source/cmSourceFile.h | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
