[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-559-g6606505

[Stephen Kelly]

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  6606505bd2c76d205d4ca46ee652c196cbbddb77 (commit)
       via  cad6dffc83775ea51b0f8e3acee5062233a8b693 (commit)
      from  b0fc765ebda20e896101790d38a4ba3205412549 (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=6606505bd2c76d205d4ca46ee652c196cbbddb77
commit 6606505bd2c76d205d4ca46ee652c196cbbddb77
Merge: b0fc765 cad6dff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 14 18:40:39 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 14 18:40:39 2015 -0400

    Merge topic 'clean-up-cmTarget' into next
    
    cad6dffc fixup! cmState: Move TargetType enum from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cad6dffc83775ea51b0f8e3acee5062233a8b693
commit cad6dffc83775ea51b0f8e3acee5062233a8b693
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 15 00:40:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 15 00:40:20 2015 +0200

    fixup! cmState: Move TargetType enum from cmTarget.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index bbb0126..6abac5d 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2692,7 +2692,7 @@ void cmVisualStudio10TargetGenerator::AddLibraries(
       libVec.push_back(path);
       }
     else if (!l->Target
-        || l->GeneratorTarget->GetType() != cmState::INTERFACE_LIBRARY)
+        || l->Target->GetType() != cmState::INTERFACE_LIBRARY)
       {
       libVec.push_back(l->Value);
       }

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

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


hooks/post-receive
-- 
CMake