[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-1072-gea67c43

Brad King brad.king at kitware.com
Thu Nov 10 13:22:45 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  ea67c43cc186b6645e4b7101a72382f1695f1852 (commit)
       via  8299eea9fc762414338c5e1b9079e9c8059d82b9 (commit)
      from  d2bb979f043dc2a86e4953e5b6336004e7183163 (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=ea67c43cc186b6645e4b7101a72382f1695f1852
commit ea67c43cc186b6645e4b7101a72382f1695f1852
Merge: d2bb979 8299eea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 13:22:44 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 10 13:22:44 2016 -0500

    Merge topic 'initial_cuda_language_support' into next
    
    8299eea9 fixup! CUDA: Add LinkLineComputer that computes cuda dlink lines.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8299eea9fc762414338c5e1b9079e9c8059d82b9
commit 8299eea9fc762414338c5e1b9079e9c8059d82b9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 13:22:23 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 10 13:22:23 2016 -0500

    fixup! CUDA: Add LinkLineComputer that computes cuda dlink lines.

diff --git a/Source/cmLinkLineDeviceComputer.h b/Source/cmLinkLineDeviceComputer.h
index f13b162..d1079d7 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() CM_OVERRIDE;
+  ~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