diff options
| author | Brad King <brad.king@kitware.com> | 2003-06-23 18:10:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2003-06-23 18:10:12 (GMT) |
| commit | 38482b46d171bde2073fadab65118c5c9df29e0f (patch) | |
| tree | cce4d062f94612f514f2b13cff42f5426c531b4b /Source/cmLocalUnixMakefileGenerator.cxx | |
| parent | b2368399d91b710616a3c53fc39bd8e11971b42f (diff) | |
| download | CMake-38482b46d171bde2073fadab65118c5c9df29e0f.zip CMake-38482b46d171bde2073fadab65118c5c9df29e0f.tar.gz CMake-38482b46d171bde2073fadab65118c5c9df29e0f.tar.bz2 | |
ENH: Merged use of the kwsys RegularExpression class instead of cmRegularExpression.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index e522765..8a16544 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -22,6 +22,8 @@ #include "cmMakeDepend.h" #include "cmCacheManager.h" #include "cmGeneratedFileStream.h" + +#include <cmsys/RegularExpression.hxx> #include <stdio.h> cmLocalUnixMakefileGenerator::cmLocalUnixMakefileGenerator() @@ -565,7 +567,7 @@ void cmLocalUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, std::string regexp = ".*\\"; regexp += linkSuffix; regexp += "$"; - cmRegularExpression hasSuffix(regexp.c_str()); + cmsys::RegularExpression hasSuffix(regexp.c_str()); std::string librariesLinked; const cmTarget::LinkLibraries& libs = tgt.GetLinkLibraries(); for(cmTarget::LinkLibraries::const_iterator lib = libs.begin(); @@ -579,7 +581,7 @@ void cmLocalUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, // if a variable expands to nothing. if (lib->first.size() == 0) continue; // if it is a full path break it into -L and -l - cmRegularExpression reg("([ \t]*\\-l)|([ \t]*\\-framework)|(\\${)"); + cmsys::RegularExpression reg("([ \t]*\\-l)|([ \t]*\\-framework)|(\\${)"); if(lib->first.find('/') != std::string::npos && !reg.find(lib->first)) { @@ -597,8 +599,8 @@ void cmLocalUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, runtimeDirs.push_back( libpath ); } } - cmRegularExpression libname("^lib([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*"); - cmRegularExpression libname_noprefix("([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*"); + cmsys::RegularExpression libname("^lib([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*"); + cmsys::RegularExpression libname_noprefix("([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*"); if(libname.find(file)) { // Library had "lib" prefix. |