kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix some warnings

Browse Source
This commit is contained in:
Bill Hoffman 2002-11-19 14:40:23 -05:00
parent ae3b1f3e70
commit fd30c82a19
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -286,8 +286,8 @@ void cmLocalUnixMakefileGenerator::OutputMakefile(const char* file,
std::string std::string
cmLocalUnixMakefileGenerator::GetOutputExtension(const char* s) cmLocalUnixMakefileGenerator::GetOutputExtension(const char* s)
{ {
std::string sourceExtension = s;
#if defined(_WIN32) && ! defined(__CYGWIN__) #if defined(_WIN32) && ! defined(__CYGWIN__)
std::string sourceExtension = s;
if(sourceExtension == "def") if(sourceExtension == "def")
{ {
return ""; return "";
@ -558,7 +558,6 @@ void cmLocalUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout,
runtimeDirs.push_back( libpath ); runtimeDirs.push_back( libpath );
} }
} }
cmRegularExpression reg(regexp.c_str());
cmRegularExpression libname("lib([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*"); cmRegularExpression libname("lib([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*");
cmRegularExpression libname_noprefix("([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*"); cmRegularExpression libname_noprefix("([^/]*)(\\.so|\\.lib|\\.dll|\\.sl|\\.a|\\.dylib).*");
if(libname.find(file)) if(libname.find(file))
@ -2185,7 +2184,6 @@ OutputBuildObjectFromSource(std::ostream& fout,
std::string objectFile = std::string(shortName) + std::string objectFile = std::string(shortName) +
this->GetOutputExtension(source.GetSourceExtension().c_str()); this->GetOutputExtension(source.GetSourceExtension().c_str());
objectFile = cmSystemTools::ConvertToOutputPath(objectFile.c_str()); objectFile = cmSystemTools::ConvertToOutputPath(objectFile.c_str());
std::string compileCommand;
cmSystemTools::FileFormat format = cmSystemTools::FileFormat format =
cmSystemTools::GetFileFormat(source.GetSourceExtension().c_str()); cmSystemTools::GetFileFormat(source.GetSourceExtension().c_str());
std::vector<std::string> rules; std::vector<std::string> rules;
@ -2250,10 +2248,8 @@ OutputBuildObjectFromSource(std::ostream& fout,
} }
case cmSystemTools::HEADER_FILE_FORMAT: case cmSystemTools::HEADER_FILE_FORMAT:
return; return;
break;
case cmSystemTools::DEFINITION_FILE_FORMAT: case cmSystemTools::DEFINITION_FILE_FORMAT:
return; return;
break;
case cmSystemTools::RESOURCE_FILE_FORMAT: case cmSystemTools::RESOURCE_FILE_FORMAT:
{ {
flags = " $(INCLUDE_FLAGS) "; flags = " $(INCLUDE_FLAGS) ";