[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-1066-g9cd8c19
Brad King
brad.king at kitware.com
Thu Nov 10 11:17:01 EST 2016
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, next has been updated
via 9cd8c198b79646bf9a1f36570ab3b09bc277dc8e (commit)
via 19ac97e80295663db6f356ba2125196f3de2656d (commit)
from bb155d82d8759e56ac07fb64bb89aebfdf761471 (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=9cd8c198b79646bf9a1f36570ab3b09bc277dc8e
commit 9cd8c198b79646bf9a1f36570ab3b09bc277dc8e
Merge: bb155d8 19ac97e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 11:16:58 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 10 11:16:58 2016 -0500
Merge topic 'initial_cuda_language_support' into next
19ac97e8 fixup! CUDA: Add LinkLineComputer that computes cuda dlink lines.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19ac97e80295663db6f356ba2125196f3de2656d
commit 19ac97e80295663db6f356ba2125196f3de2656d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 11:16:11 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 10 11:16:11 2016 -0500
fixup! CUDA: Add LinkLineComputer that computes cuda dlink lines.
diff --git a/Source/cmLinkLineDeviceComputer.h b/Source/cmLinkLineDeviceComputer.h
index 051a9c5..f13b162 100644
--- a/Source/cmLinkLineDeviceComputer.h
+++ b/Source/cmLinkLineDeviceComputer.h
@@ -12,7 +12,7 @@ class cmLinkLineDeviceComputer : public cmLinkLineComputer
public:
cmLinkLineDeviceComputer(cmOutputConverter* outputConverter,
cmStateDirectory stateDir);
- virtual ~cmLinkLineDeviceComputer();
+ virtual ~cmLinkLineDeviceComputer() CM_OVERRIDE;
std::string ComputeLinkLibraries(cmComputeLinkInformation& cli,
std::string const& stdLibString)
-----------------------------------------------------------------------
Summary of changes:
Source/cmLinkLineDeviceComputer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list