[Cmake-commits] CMake branch, master, updated. v3.15.0-rc3-284-g70290a2
Kitware Robot
kwrobot at kitware.com
Wed Jul 10 09:23:09 EDT 2019
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 70290a2abf9e192bb1e0267ec9a6abedde9ba7db (commit)
via 88bb13827e39c4286dea1b2a4ff75f975816005f (commit)
via 96a35a8eed624ec326f13d1e7d3d735c7b35bcae (commit)
via 29a1a68e903640bd79483e4b6ba13bd93fe3a3f5 (commit)
via 27bd921b38121fb6be54e8b200252c2914049dea (commit)
via 98844aaa6f2309ebac5bf18e2cb24f5c44e6aa07 (commit)
via e902a111182b27058cdea9d3f71b3fcb4d729476 (commit)
via 366746bbef613f9d258e66a32f8fbacd407acfba (commit)
via 0a7b61269c48b43cbc6677c0871ce3d519d460d6 (commit)
via 98e371f13e0a8dc35367f98b027f62802b3ed280 (commit)
via 88954496488e5b41b599d580d8b673168295d841 (commit)
via 8e1664d108a183a9e1e53a3a42bc58a2a0104d60 (commit)
from 8c7a627f38f4eeeef81b9c5a89d20ddbcd3c1752 (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=70290a2abf9e192bb1e0267ec9a6abedde9ba7db
commit 70290a2abf9e192bb1e0267ec9a6abedde9ba7db
Merge: 88bb138 98844aa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 10 09:22:19 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 10 09:22:19 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88bb13827e39c4286dea1b2a4ff75f975816005f
commit 88bb13827e39c4286dea1b2a4ff75f975816005f
Merge: 96a35a8 366746b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 10 09:22:02 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 10 09:22:02 2019 -0400
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96a35a8eed624ec326f13d1e7d3d735c7b35bcae
commit 96a35a8eed624ec326f13d1e7d3d735c7b35bcae
Merge: 29a1a68 0a7b612
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 10 13:20:55 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jul 10 09:21:24 2019 -0400
Merge topic 'implicit-includes-cray-hlist'
0a7b61269c Merge branch 'backport-implicit-includes-cray-hlist'
98e371f13e Cray: Fix include parsing when the -hlist= flag is present
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3532
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29a1a68e903640bd79483e4b6ba13bd93fe3a3f5
commit 29a1a68e903640bd79483e4b6ba13bd93fe3a3f5
Merge: 27bd921 8895449
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 10 13:20:23 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jul 10 09:20:32 2019 -0400
Merge topic 'cuda-imported-library-device-linking'
8895449648 CUDA: Restore device linking to imported static library targets
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3526
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27bd921b38121fb6be54e8b200252c2914049dea
commit 27bd921b38121fb6be54e8b200252c2914049dea
Merge: 8c7a627 8e1664d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 10 13:19:20 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jul 10 09:19:36 2019 -0400
Merge topic 'emacs/drop-23'
8e1664d108 cmake-mode.el: Drop support for Emacs < 24
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3520
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=366746bbef613f9d258e66a32f8fbacd407acfba
commit 366746bbef613f9d258e66a32f8fbacd407acfba
Merge: c54fc82 98e371f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 9 13:14:24 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 9 13:14:24 2019 -0400
Merge branch 'backport-implicit-includes-cray-hlist' into release-3.14
Merge-request: !3532
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e1664d108a183a9e1e53a3a42bc58a2a0104d60
commit 8e1664d108a183a9e1e53a3a42bc58a2a0104d60
Author: Hong Xu <hong at topbug.net>
AuthorDate: Sat Jul 6 18:09:50 2019 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 9 10:50:19 2019 -0400
cmake-mode.el: Drop support for Emacs < 24
The `cmake--parent-mode` alias exists only for compatibility and breaks
Emacs packages and scripts that make use of `prog-mode-hook` because
Emacs does not examine whether the parent mode is an alias or not.
Remove the alias and require Emacs 24 or higher.
Emacs 24 was released in 2012 and this is already 2019, thus the loss to
drop support for versions < 24 is negligible.
diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index e4fa6c1..caaf0d5 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -1,5 +1,7 @@
;;; cmake-mode.el --- major-mode for editing CMake sources
+;; Package-Requires: ((emacs "24.1"))
+
; Distributed under the OSI-approved BSD 3-Clause License. See accompanying
; file Copyright.txt or https://cmake.org/licensing for details.
@@ -224,17 +226,11 @@ the indentation. Otherwise it retains the same position on the line"
;;
(defvar cmake-mode-hook nil)
-;------------------------------------------------------------------------------
-
-;; For compatibility with Emacs < 24
-(defalias 'cmake--parent-mode
- (if (fboundp 'prog-mode) 'prog-mode 'fundamental-mode))
-
;;------------------------------------------------------------------------------
;; Mode definition.
;;
;;;###autoload
-(define-derived-mode cmake-mode cmake--parent-mode "CMake"
+(define-derived-mode cmake-mode prog-mode "CMake"
"Major mode for editing CMake source files."
; Setup font-lock mode.
-----------------------------------------------------------------------
Summary of changes:
Auxiliary/cmake-mode.el | 10 ++--
Modules/CMakeParseImplicitIncludeInfo.cmake | 4 +-
Source/cmLinkLineDeviceComputer.cxx | 17 ++++---
.../ParseImplicitIncludeInfo.cmake | 1 +
.../data/craype-C-Cray-9.0-hlist-ad.input | 54 ++++++++++++++++++++++
.../data/craype-C-Cray-9.0-hlist-ad.output | 1 +
.../data/craype-CXX-Cray-9.0-hlist-ad.input | 54 ++++++++++++++++++++++
.../data/craype-CXX-Cray-9.0-hlist-ad.output | 1 +
.../data/craype-Fortran-Cray-9.0-hlist-ad.input | 53 +++++++++++++++++++++
.../data/craype-Fortran-Cray-9.0-hlist-ad.output | 1 +
10 files changed, 181 insertions(+), 15 deletions(-)
create mode 100644 Tests/RunCMake/ParseImplicitIncludeInfo/data/craype-C-Cray-9.0-hlist-ad.input
create mode 100644 Tests/RunCMake/ParseImplicitIncludeInfo/data/craype-C-Cray-9.0-hlist-ad.output
create mode 100644 Tests/RunCMake/ParseImplicitIncludeInfo/data/craype-CXX-Cray-9.0-hlist-ad.input
create mode 100644 Tests/RunCMake/ParseImplicitIncludeInfo/data/craype-CXX-Cray-9.0-hlist-ad.output
create mode 100644 Tests/RunCMake/ParseImplicitIncludeInfo/data/craype-Fortran-Cray-9.0-hlist-ad.input
create mode 100644 Tests/RunCMake/ParseImplicitIncludeInfo/data/craype-Fortran-Cray-9.0-hlist-ad.output
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list