diff options
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index de20907..3c5c7cc 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -555,6 +555,7 @@ void cmLocalUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, cmRegularExpression libname_noprefix("([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*"); if(libname.find(file)) { + // Library had "lib" prefix. librariesLinked += libLinkFlag; file = libname.match(1); librariesLinked += file; @@ -566,6 +567,7 @@ void cmLocalUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, } else if(libname_noprefix.find(file)) { + // Library had no "lib" prefix. librariesLinked += libLinkFlag; file = libname_noprefix.match(1); librariesLinked += file; @@ -575,6 +577,13 @@ void cmLocalUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, } librariesLinked += " "; } + else + { + // Error parsing the library name. Just use the full path. + // The linker will give an error if it is invalid. + librariesLinked += lib->first; + librariesLinked += " "; + } } // not a full path, so add -l name else |