From b7701cfa1afb9075b41db04bd598e1cc38dcb097 Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Mon, 11 Nov 2002 13:15:52 -0500 Subject: Fix regular expressions to be able to handle windows libraries --- Source/cmLocalUnixMakefileGenerator.cxx | 5 +++-- 1 file 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; -- cgit v0.12