[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-378-g7d99813

[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  7d99813287edba3d73d85f479347a23996bc0ae6 (commit)
       via  08fa0b4595566a6e4c29c182865a6ec7e41d9e2e (commit)
      from  0829afd56fc3c04fe714cbb28d2f6bcefbe573c9 (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=7d99813287edba3d73d85f479347a23996bc0ae6
commit 7d99813287edba3d73d85f479347a23996bc0ae6
Merge: 0829afd 08fa0b4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 17:13:39 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 20 17:13:39 2017 -0500

    Merge topic 'cuda-separable-bool' into next
    
    08fa0b45 CUDA: Fix boolean interpretation of CUDA_SEPARABLE_COMPILATION


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08fa0b4595566a6e4c29c182865a6ec7e41d9e2e
commit 08fa0b4595566a6e4c29c182865a6ec7e41d9e2e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 17:05:35 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 20 17:05:35 2017 -0500

    CUDA: Fix boolean interpretation of CUDA_SEPARABLE_COMPILATION
    
    If the property is explicitly set to a non-true value we should
    not treat it as true.

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 866c132..54b3f36 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -590,7 +590,8 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
     std::vector<std::string> compileCommands;
     if (lang == "CUDA") {
       std::string cmdVar;
-      if (this->GeneratorTarget->GetProperty("CUDA_SEPARABLE_COMPILATION")) {
+      if (this->GeneratorTarget->GetPropertyAsBool(
+            "CUDA_SEPARABLE_COMPILATION")) {
         cmdVar = std::string("CMAKE_CUDA_COMPILE_SEPARABLE_COMPILATION");
       } else {
         cmdVar = std::string("CMAKE_CUDA_COMPILE_WHOLE_COMPILATION");
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 0b33b19..f096416 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -580,7 +580,8 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
   std::vector<std::string> compileCmds;
   if (lang == "CUDA") {
     std::string cmdVar;
-    if (this->GeneratorTarget->GetProperty("CUDA_SEPARABLE_COMPILATION")) {
+    if (this->GeneratorTarget->GetPropertyAsBool(
+          "CUDA_SEPARABLE_COMPILATION")) {
       cmdVar = std::string("CMAKE_CUDA_COMPILE_SEPARABLE_COMPILATION");
     } else {
       cmdVar = std::string("CMAKE_CUDA_COMPILE_WHOLE_COMPILATION");

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

Summary of changes:
 Source/cmMakefileTargetGenerator.cxx |    3 ++-
 Source/cmNinjaTargetGenerator.cxx    |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake