diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-11-11 18:15:52 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-11-11 18:15:52 (GMT) |
| commit | b7701cfa1afb9075b41db04bd598e1cc38dcb097 (patch) | |
| tree | 58dc8088b4bfd65a2f20242efdeeee6de669b9ac /Source | |
| parent | d1051bb575b2f1e568ac9fe4599a0bf0eea66392 (diff) | |
| download | CMake-b7701cfa1afb9075b41db04bd598e1cc38dcb097.zip CMake-b7701cfa1afb9075b41db04bd598e1cc38dcb097.tar.gz CMake-b7701cfa1afb9075b41db04bd598e1cc38dcb097.tar.bz2 | |
Fix regular expressions to be able to handle windows libraries
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index e96f104..cb707c4 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -559,8 +559,9 @@ void cmLocalUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, } } cmRegularExpression reg(regexp.c_str()); - cmRegularExpression libname("lib(.*)(\\.so|\\.sl|\\.a|\\.dylib).*"); - cmRegularExpression libname_noprefix("(.*)(\\.so|\\.sl|\\.a|\\.dylib).*"); + cmRegularExpression libname("lib([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*"); + cmRegularExpression libname_noprefix("([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*"); + if(libname.find(file)) { librariesLinked += libLinkFlag; |