diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-11-19 19:40:23 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-11-19 19:40:23 (GMT) |
| commit | fd30c82a19a9424d477742f6a9c24e9e41ca4471 (patch) | |
| tree | 0e3c31d7c491df34d95b0350f0439e5d730b509d /Source/cmLocalUnixMakefileGenerator.cxx | |
| parent | ae3b1f3e7082e3310cb67def878e3c29367887a1 (diff) | |
| download | CMake-fd30c82a19a9424d477742f6a9c24e9e41ca4471.zip CMake-fd30c82a19a9424d477742f6a9c24e9e41ca4471.tar.gz CMake-fd30c82a19a9424d477742f6a9c24e9e41ca4471.tar.bz2 | |
fix some warnings
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index bb90c87..52af3e5 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -286,8 +286,8 @@ void cmLocalUnixMakefileGenerator::OutputMakefile(const char* file, std::string cmLocalUnixMakefileGenerator::GetOutputExtension(const char* s) { - std::string sourceExtension = s; #if defined(_WIN32) && ! defined(__CYGWIN__) + std::string sourceExtension = s; if(sourceExtension == "def") { return ""; @@ -558,7 +558,6 @@ void cmLocalUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, runtimeDirs.push_back( libpath ); } } - cmRegularExpression reg(regexp.c_str()); cmRegularExpression libname("lib([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*"); cmRegularExpression libname_noprefix("([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*"); if(libname.find(file)) @@ -2185,7 +2184,6 @@ OutputBuildObjectFromSource(std::ostream& fout, std::string objectFile = std::string(shortName) + this->GetOutputExtension(source.GetSourceExtension().c_str()); objectFile = cmSystemTools::ConvertToOutputPath(objectFile.c_str()); - std::string compileCommand; cmSystemTools::FileFormat format = cmSystemTools::GetFileFormat(source.GetSourceExtension().c_str()); std::vector<std::string> rules; @@ -2250,10 +2248,8 @@ OutputBuildObjectFromSource(std::ostream& fout, } case cmSystemTools::HEADER_FILE_FORMAT: return; - break; case cmSystemTools::DEFINITION_FILE_FORMAT: return; - break; case cmSystemTools::RESOURCE_FILE_FORMAT: { flags = " $(INCLUDE_FLAGS) "; |