[Cmake-commits] CMake branch, next, updated. v3.5.0-470-g0340538

[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  03405388a88dd8a4c35c7bce8c7a3ff66978ea31 (commit)
       via  456ffca8a1c4b3596cc1ab68d1d5ef9f4ee3c03a (commit)
      from  0726f7a3f87a591af2d3f3e559b6ad2a16102062 (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=03405388a88dd8a4c35c7bce8c7a3ff66978ea31
commit 03405388a88dd8a4c35c7bce8c7a3ff66978ea31
Merge: 0726f7a 456ffca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 16 09:03:21 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 16 09:03:21 2016 -0400

    Merge topic 'use-GetCMakeRoot' into next
    
    456ffca8 fixup! Avoid depending on CMAKE_ROOT cache entry internally (#16015)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=456ffca8a1c4b3596cc1ab68d1d5ef9f4ee3c03a
commit 456ffca8a1c4b3596cc1ab68d1d5ef9f4ee3c03a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 16 09:03:08 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 16 09:03:08 2016 -0400

    fixup! Avoid depending on CMAKE_ROOT cache entry internally (#16015)

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 14e9a88..00bb511 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -184,7 +184,6 @@ void RegisterVisualStudioMacros(const std::string& macrosFile,
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudioGenerator::ConfigureCMakeVisualStudioMacros()
 {
-  cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();
   std::string dir = this->GetUserMacrosDirectory();
 
   if (dir != "")

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

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx |    1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
CMake