[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-395-g19c2c04

[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  19c2c041e4c0a6a0bdac1255588c19a97c66e886 (commit)
       via  4c913ae3eced731ed1815542b870b83ca192d695 (commit)
      from  b78c76d7528b2e2c76b6f88c50cf571e33e5e42b (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=19c2c041e4c0a6a0bdac1255588c19a97c66e886
commit 19c2c041e4c0a6a0bdac1255588c19a97c66e886
Merge: b78c76d 4c913ae
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 09:45:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 10 09:45:46 2015 -0400

    Merge topic 'use-generator-target' into next
    
    4c913ae3 fixup! cmTarget: Move link type enum out.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c913ae3eced731ed1815542b870b83ca192d695
commit 4c913ae3eced731ed1815542b870b83ca192d695
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 10 15:45:25 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 10 15:45:25 2015 +0200

    fixup! cmTarget: Move link type enum out.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index eb54add..d639f1d 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1162,7 +1162,7 @@ void cmTarget::GatherDependenciesForVS6( const cmMakefile& mf,
 
     // Parse the dependency information, which is a set of
     // type, library pairs separated by ";". There is always a trailing ";".
-    cmTarget::LinkLibraryType llt = GENERAL_LibraryType;
+    cmTargetLinkLibraryType llt = GENERAL_LibraryType;
     std::string depline = deps;
     std::string::size_type start = 0;
     std::string::size_type end;

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

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


hooks/post-receive
-- 
CMake