diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-08-10 16:55:41 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-08-10 16:55:41 (GMT) |
| commit | e59e9d0e5972ef251157d412d4a0ae341caa379f (patch) | |
| tree | 01ed394b0de6b1bd7a5d28b1afa5f14453231f72 /Source/cmOrderLinkDirectories.cxx | |
| parent | b058a5e1aa8ac7c54552eff5519a9b43ab20a08d (diff) | |
| download | CMake-e59e9d0e5972ef251157d412d4a0ae341caa379f.zip CMake-e59e9d0e5972ef251157d412d4a0ae341caa379f.tar.gz CMake-e59e9d0e5972ef251157d412d4a0ae341caa379f.tar.bz2 | |
ENH: fix bug 2087 lib prefix stripped off on windows
Diffstat (limited to 'Source/cmOrderLinkDirectories.cxx')
| -rw-r--r-- | Source/cmOrderLinkDirectories.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Source/cmOrderLinkDirectories.cxx b/Source/cmOrderLinkDirectories.cxx index afc7a5c..96ece46 100644 --- a/Source/cmOrderLinkDirectories.cxx +++ b/Source/cmOrderLinkDirectories.cxx @@ -115,17 +115,23 @@ void cmOrderLinkDirectories::CreateRegularExpressions() } first = false; libext += "\\"; -#ifndef _WIN32 - libext += *i; -#else +#if defined(_WIN32) && !defined(__CYGWIN__) libext += this->NoCaseExpression(i->c_str()); +#else + libext += *i; #endif } libext += ").*"; cmStdString reg("(.*)"); reg += libext; m_RemoveLibraryExtension.compile(reg.c_str()); - reg = "^lib([^/]*)"; + reg = ""; + if(m_LinkPrefix.size()) + { + reg = "^"; + reg += m_LinkPrefix; + } + reg += "([^/]*)"; reg += libext; m_ExtractBaseLibraryName.compile(reg.c_str()); reg = "([^/]*)"; |