diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-02-06 12:18:10 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-07 15:21:08 (GMT) |
| commit | 92e98dd909bd399f508ff7c2f9657095ddc766cc (patch) | |
| tree | 37cdba7d39615395842c1a1a0dffb84f1b68fc68 /Source/cmTarget.cxx | |
| parent | 1714c27a74c1616e5998a1a51fe42848a1f1c389 (diff) | |
| download | CMake-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/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index ca0e24b..2eaf1c1 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -2270,14 +2270,6 @@ static std::string targetNameGenex(const char *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 cmTarget::AddLinkLibrary(cmMakefile& mf, const char *target, const char* lib, LinkLibraryType llt) @@ -2300,7 +2292,7 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf, llt).c_str()); } - if (isGeneratorExpression(lib)) + if (cmGeneratorExpression::Find(lib) != std::string::npos) { return; } |