diff options
| author | Brad King <brad.king@kitware.com> | 2001-07-10 17:57:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2001-07-10 17:57:35 (GMT) |
| commit | f7ca7fb868f8ec6e24b6a8b4753f61e5588624bc (patch) | |
| tree | 39fa17026acd957ccb79f0f7cba6d0b207b201d9 /Source/cmUnixMakefileGenerator.cxx | |
| parent | fdd48818db9c98d81afb4d4f7eec1efd1bdc0376 (diff) | |
| download | CMake-f7ca7fb868f8ec6e24b6a8b4753f61e5588624bc.zip CMake-f7ca7fb868f8ec6e24b6a8b4753f61e5588624bc.tar.gz CMake-f7ca7fb868f8ec6e24b6a8b4753f61e5588624bc.tar.bz2 | |
BUG: When splitting a full path library into separate -L and -l parts, the -l part may not have a "lib" prefix on cygwin.
Diffstat (limited to 'Source/cmUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index e1d1055..dc80bf8 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -426,6 +426,7 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, } } cmRegularExpression libname("lib(.*)\\.(.*)"); + cmRegularExpression libname_noprefix("(.*)\\.(.*)"); if(libname.find(file)) { librariesLinked += "-l"; @@ -433,6 +434,13 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, librariesLinked += file; librariesLinked += " "; } + else if(libname_noprefix.find(file)) + { + librariesLinked += "-l"; + file = libname_noprefix.match(1); + librariesLinked += file; + librariesLinked += " "; + } } // not a full path, so add -l name else |