[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1600-g93508c1

[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  93508c10e520978aec8a0c287a6ca3f5de43c16b (commit)
       via  2b3699a45f98dcb110bd0eac6bb054e36f7aac03 (commit)
      from  5919286f676efbbe146c26adb5f1176a212b450b (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=93508c10e520978aec8a0c287a6ca3f5de43c16b
commit 93508c10e520978aec8a0c287a6ca3f5de43c16b
Merge: 5919286 2b3699a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 31 02:23:20 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 31 02:23:20 2014 -0400

    Merge topic 'target-transitive-sources' into next
    
    2b3699a4 Use Build type.


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

    Use Build type.

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

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

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


hooks/post-receive
-- 
CMake