[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1988-g911b65c

[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  911b65c2fbab85bff5f3425bbeb70a1d74c63981 (commit)
       via  a1f8afb6ed68a132a4853c0d2f30c56de16d5d4d (commit)
      from  d9ec849ae7248f671d3e954eb41a68763cb2dcd4 (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=911b65c2fbab85bff5f3425bbeb70a1d74c63981
commit 911b65c2fbab85bff5f3425bbeb70a1d74c63981
Merge: d9ec849 a1f8afb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 7 10:20:43 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 7 10:20:43 2013 -0500

    Merge topic 'minor-fixes' into next
    
    a1f8afb Remove another isGeneratorExpression.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1f8afb6ed68a132a4853c0d2f30c56de16d5d4d
commit a1f8afb6ed68a132a4853c0d2f30c56de16d5d4d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 7 16:18:42 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 7 16:18:42 2013 +0100

    Remove another isGeneratorExpression.

diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 520c7a8..9dd0e5b 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -267,19 +267,11 @@ static std::string compileProperty(cmTarget *tgt, const std::string &lib,
 }
 
 //----------------------------------------------------------------------------
-static bool isGeneratorExpression(const std::string &lib)
-{
-  const std::string::size_type openpos = lib.find("$<");
-  return (openpos != std::string::npos)
-      && (lib.find(">", openpos) != std::string::npos);
-}
-
-//----------------------------------------------------------------------------
 void
 cmTargetLinkLibrariesCommand::HandleLibrary(const char* lib,
                                             cmTarget::LinkLibraryType llt)
 {
-  const bool isGenex = isGeneratorExpression(lib);
+  const bool isGenex = cmGeneratorExpression::Find(lib) != std::string::npos;
 
   const bool potentialTargetName
                               = cmGeneratorExpression::IsValidTargetName(lib);

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

Summary of changes:
 Source/cmTargetLinkLibrariesCommand.cxx |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake