[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1608-gb308f89

[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  b308f89e61305028d49f489c4082dcb492b4f008 (commit)
       via  b59ac8b33fefccd30a9dbc11f4177204fb49e9aa (commit)
      from  0d420318ce931307db9b8b3994b73e506643f82c (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b308f89e61305028d49f489c4082dcb492b4f008
commit b308f89e61305028d49f489c4082dcb492b4f008
Merge: 0d42031 b59ac8b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 31 02:34:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 31 02:34:51 2014 -0400

    Merge topic 'target-transitive-sources' into next
    
    b59ac8b3 Simplify.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b59ac8b33fefccd30a9dbc11f4177204fb49e9aa
commit b59ac8b33fefccd30a9dbc11f4177204fb49e9aa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 31 08:33:13 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 31 08:33:13 2014 +0200

    Simplify.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 735abec9..e2f8375 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1693,8 +1693,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
         linkFlags += this->Makefile->GetSafeDefinition(build);
         linkFlags += " ";
         }
-      std::string linkLanguage = target->Target->GetLinkerLanguage(
-                      this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
+      std::string linkLanguage = target->Target->GetLinkerLanguage(buildType);
       if(linkLanguage.empty())
         {
         cmSystemTools::Error

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

Summary of changes:
 Source/cmLocalGenerator.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake