diff options
| author | Brad King <brad.king@kitware.com> | 2001-05-25 18:27:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2001-05-25 18:27:30 (GMT) |
| commit | c60696ccaf8a0d35a424389106d7d11c37248382 (patch) | |
| tree | 1b8b27cbd0c16418c880a86519f90967d0d47f5f /Source/cmUnixMakefileGenerator.cxx | |
| parent | f190cb8dc20e1130d0237778d4e81f0d515732df (diff) | |
| download | CMake-c60696ccaf8a0d35a424389106d7d11c37248382.zip CMake-c60696ccaf8a0d35a424389106d7d11c37248382.tar.gz CMake-c60696ccaf8a0d35a424389106d7d11c37248382.tar.bz2 | |
BUG: Fixed logic that splits a full path library link into the -L and -l pieces to not write out a -l by itself if the file regular expression does not match.
Diffstat (limited to 'Source/cmUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index d6f0737..5038bde 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -292,14 +292,14 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, linkLibs += libpath; linkLibs += " "; } - librariesLinked += "-l"; cmRegularExpression libname("lib(.*)\\.(.*)"); if(libname.find(file)) { + librariesLinked += "-l"; file = libname.match(1); + librariesLinked += file; + librariesLinked += " "; } - librariesLinked += file; - librariesLinked += " "; } // not a full path, so add -l name else |