summaryrefslogtreecommitdiffstats
path: root/Source/cmTargetLinkLibrariesCommand.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-02-06 12:18:10 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-02-07 15:21:08 (GMT)
commit92e98dd909bd399f508ff7c2f9657095ddc766cc (patch)
tree37cdba7d39615395842c1a1a0dffb84f1b68fc68 /Source/cmTargetLinkLibrariesCommand.cxx
parent1714c27a74c1616e5998a1a51fe42848a1f1c389 (diff)
downloadCMake-92e98dd909bd399f508ff7c2f9657095ddc766cc.zip
CMake-92e98dd909bd399f508ff7c2f9657095ddc766cc.tar.gz
CMake-92e98dd909bd399f508ff7c2f9657095ddc766cc.tar.bz2
Deduplicate the isGeneratorExpression method.
This API seems like the most appropriate.
Diffstat (limited to 'Source/cmTargetLinkLibrariesCommand.cxx')
-rw-r--r--Source/cmTargetLinkLibrariesCommand.cxx10
1 files changed, 1 insertions, 9 deletions
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index cb913f5..fab3306 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -265,19 +265,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;
cmsys::RegularExpression targetNameValidator;
targetNameValidator.compile("^[A-Za-z0-9_.:-]+$");