[Cmake-commits] CMake branch, master, updated. v3.11.1-746-gd3292d2

[Kitware Robot]

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  d3292d2d102710cb66d933dc27d72e3002d008b9 (commit)
       via  0bd1d1fcc44f4be76ee0d03d42801381a404d1c3 (commit)
      from  547df3a38589afdee4335d76668bcc9d43d48843 (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=d3292d2d102710cb66d933dc27d72e3002d008b9
commit d3292d2d102710cb66d933dc27d72e3002d008b9
Merge: 547df3a 0bd1d1f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 9 11:44:20 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed May 9 07:44:28 2018 -0400

    Merge topic 'vs-refactor-xml'
    
    0bd1d1fcc4 VS: Fix regression in XML generation for CUDA
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2053


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bd1d1fcc44f4be76ee0d03d42801381a404d1c3
commit 0bd1d1fcc44f4be76ee0d03d42801381a404d1c3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 8 10:29:22 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 8 10:29:22 2018 -0400

    VS: Fix regression in XML generation for CUDA
    
    Refactoring in commit 3f315dc128 (cmVisualStudio10TargetGenerator: XML
    refactoring, 2018-05-02) accidentally left the `<Import>` element for
    the CUDA build customizations unclosed.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 7a7c647..d99f084 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -667,7 +667,8 @@ void cmVisualStudio10TargetGenerator::Generate()
       Elem(e1, "Import")
         .Attribute("Project", "$(VCTargetsPath)\\BuildCustomizations\\CUDA " +
                      this->GlobalGenerator->GetPlatformToolsetCudaString() +
-                     ".targets");
+                     ".targets")
+        .EndElement();
     }
     if (this->GlobalGenerator->IsMasmEnabled()) {
       Elem(e1, "Import")

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake