[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-1064-gbb155d8

[Brad King]

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  bb155d82d8759e56ac07fb64bb89aebfdf761471 (commit)
       via  49edf4705c7e1fda9430a2a686290cd2f48dd72d (commit)
      from  5c5893fcc28264c6bca1c933e30058d28d2aac50 (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=bb155d82d8759e56ac07fb64bb89aebfdf761471
commit bb155d82d8759e56ac07fb64bb89aebfdf761471
Merge: 5c5893f 49edf47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 09:46:29 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 10 09:46:29 2016 -0500

    Merge topic 'initial_cuda_language_support' into next
    
    49edf470 fixup! CUDA: Add separable compilation support to the makefile generator.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49edf4705c7e1fda9430a2a686290cd2f48dd72d
commit 49edf4705c7e1fda9430a2a686290cd2f48dd72d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 09:45:43 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 10 09:45:43 2016 -0500

    fixup! CUDA: Add separable compilation support to the makefile generator.

diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index 4a5eca8..069011d 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -80,9 +80,11 @@ void cmMakefileExecutableTargetGenerator::WriteRuleFiles()
   // close the streams
   this->CloseFileStreams();
 }
+
 void cmMakefileExecutableTargetGenerator::WriteDeviceExecutableRule(
   bool relink)
 {
+#ifdef CMAKE_BUILD_WITH_CMAKE
   const std::string cuda_lang("CUDA");
   cmGeneratorTarget::LinkClosure const* closure =
     this->GeneratorTarget->GetLinkClosure(this->ConfigName);
@@ -286,6 +288,9 @@ void cmMakefileExecutableTargetGenerator::WriteDeviceExecutableRule(
   // Clean all the possible executable names and symlinks.
   this->CleanFiles.insert(this->CleanFiles.end(), exeCleanFiles.begin(),
                           exeCleanFiles.end());
+#else
+  static_cast<void>(relink);
+#endif
 }
 
 void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 128aa7a..2b0e1b1 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -270,6 +270,7 @@ void cmMakefileLibraryTargetGenerator::WriteFrameworkRules(bool relink)
 void cmMakefileLibraryTargetGenerator::WriteDeviceLibraryRules(
   const std::string& linkRuleVar, const std::string& extraFlags, bool relink)
 {
+#ifdef CMAKE_BUILD_WITH_CMAKE
   // TODO: Merge the methods that call this method to avoid
   // code duplication.
   std::vector<std::string> commands;
@@ -433,6 +434,11 @@ void cmMakefileLibraryTargetGenerator::WriteDeviceLibraryRules(
 
   // Write the main driver rule to build everything in this target.
   this->WriteTargetDriverRule(targetOutputReal, relink);
+#else
+  static_cast<void>(linkRuleVar);
+  static_cast<void>(extraFlags);
+  static_cast<void>(relink);
+#endif
 }
 
 void cmMakefileLibraryTargetGenerator::WriteLibraryRules(

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefileExecutableTargetGenerator.cxx |    5 +++++
 Source/cmMakefileLibraryTargetGenerator.cxx    |    6 ++++++
 2 files changed, 11 insertions(+)


hooks/post-receive
-- 
CMake