diff options
| author | Brad King <brad.king@kitware.com> | 2008-04-30 22:04:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-04-30 22:04:48 (GMT) |
| commit | 3a5bdaa21319665405104964562dd471aee7cb48 (patch) | |
| tree | 935e1dea807312fc591a429f340dc3efe744c944 /Source/cmComputeLinkInformation.cxx | |
| parent | 9631c499dc31ea1aba70201afc1a565b84c33620 (diff) | |
| download | CMake-3a5bdaa21319665405104964562dd471aee7cb48.zip CMake-3a5bdaa21319665405104964562dd471aee7cb48.tar.gz CMake-3a5bdaa21319665405104964562dd471aee7cb48.tar.bz2 | |
ENH: When preserving potentially static portions of original user link lines recognize shared library names by their extension and skip them.
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 5e10537..b133e35 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -511,6 +511,7 @@ bool cmComputeLinkInformation::Compute() // Compute the ordered link line items. cmComputeLinkDepends cld(this->Target, this->Config); cld.SetOldLinkDirMode(this->OldLinkDirMode); + cld.SetSharedRegex(this->SharedRegexString); cmComputeLinkDepends::EntryVector const& linkEntries = cld.Compute(); // Add the link line items. @@ -864,7 +865,9 @@ void cmComputeLinkInformation::ComputeItemParserInfo() if(!this->SharedLinkExtensions.empty()) { std::string reg_shared = reg; - reg_shared += this->CreateExtensionRegex(this->SharedLinkExtensions); + this->SharedRegexString = + this->CreateExtensionRegex(this->SharedLinkExtensions); + reg_shared += this->SharedRegexString; #ifdef CM_COMPUTE_LINK_INFO_DEBUG fprintf(stderr, "shared regex [%s]\n", reg_shared.c_str()); #endif |