[Cmake-commits] CMake branch, next, updated. v2.8.7-2919-g91d99fe

[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  91d99fed7beee4caa39e29b6f48905c2ddf069cd (commit)
       via  4f6fd961da510d9a2b6144e48272c68101376f0f (commit)
      from  c8ce42de587a06242b7db0df2159208f76703cd0 (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=91d99fed7beee4caa39e29b6f48905c2ddf069cd
commit 91d99fed7beee4caa39e29b6f48905c2ddf069cd
Merge: c8ce42d 4f6fd96
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 11:59:56 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 27 11:59:56 2012 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f6fd961da510d9a2b6144e48272c68101376f0f
commit 4f6fd961da510d9a2b6144e48272c68101376f0f
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 11:59:15 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..501fe61 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1902,15 +1902,8 @@ bool cmLocalGenerator::GetRealDependency(const char* inName,
       case cmTarget::SHARED_LIBRARY:
       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;
-          }
-        }
-        break;
+        dep = target->GetLocation(config);
+        return true;
       case cmTarget::UTILITY:
       case cmTarget::GLOBAL_TARGET:
         // A utility target has no file on which to depend.  This was listed

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

Summary of changes:


hooks/post-receive
-- 
CMake