[Cmake-commits] CMake branch, next, updated. v2.8.7-2898-ge7dd27e

[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  e7dd27e61cc9936a41141da90af5172315273497 (commit)
       via  ead3a551595d08627de376ed34b86bf58cd7ab04 (commit)
      from  6ba826427629355ba6a9b1eb58da568c8b0ce0e4 (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=e7dd27e61cc9936a41141da90af5172315273497
commit e7dd27e61cc9936a41141da90af5172315273497
Merge: 6ba8264 ead3a55
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 08:44:02 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 27 08:44:02 2012 -0500

    Merge topic 'simplify-GetRealDependency' into next
    
    ead3a55 Drop if(...) check because condition is always true


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ead3a551595d08627de376ed34b86bf58cd7ab04
commit ead3a551595d08627de376ed34b86bf58cd7ab04
Author:     Yury G. Kudryashov <urkud.urkud at gmail.com>
AuthorDate: Sat Feb 25 13:20:57 2012 +0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 27 08:36:45 2012 -0500

    Drop if(...) check because condition is always true
    
    GetLocation returns std::string::c_str() which is never NULL

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index ffbeb48..ea48dd1 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1903,12 +1903,8 @@ bool cmLocalGenerator::GetRealDependency(const char* inName,
       case cmTarget::MODULE_LIBRARY:
       case cmTarget::UNKNOWN_LIBRARY:
         {
-        // Get the location of the target's output file and depend on it.
-        if(const char* location = target->GetLocation(config))
-          {
-          dep = location;
-          return true;
-          }
+        dep = target->GetLocation(config);
+        return true;
         }
         break;
       case cmTarget::UTILITY:

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

Summary of changes:
 Source/cmLocalGenerator.cxx |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake