diff options
| -rw-r--r-- | Source/cmBuildCommand.cxx | 5 | ||||
| -rw-r--r-- | Source/cmDSPWriter.cxx | 2 | ||||
| -rw-r--r-- | Source/cmDSWWriter.cxx | 2 | ||||
| -rw-r--r-- | Source/cmIfCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmake.cxx | 2 |
6 files changed, 8 insertions, 11 deletions
diff --git a/Source/cmBuildCommand.cxx b/Source/cmBuildCommand.cxx index a778883..bc4bcba 100644 --- a/Source/cmBuildCommand.cxx +++ b/Source/cmBuildCommand.cxx @@ -69,10 +69,7 @@ bool cmBuildCommand::InitialPass(std::vector<std::string> const& args) makecommand += m_Makefile->GetProjectName(); makecommand += ".dsw /MAKE \"ALL_BUILD - Release\" "; } - else if(makeprogram.find("Borland") != std::string::npos || - makeprogram.find("BORLAND") != std::string::npos || - makeprogram.find("borland") != std::string::npos || - compiler.find("Borland") != std::string::npos) + else if(m_Makefile->GetDefinition("BORLAND")) { makecommand = makeprogram; makecommand += " -i"; diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx index 022d644..5c739ca 100644 --- a/Source/cmDSPWriter.cxx +++ b/Source/cmDSPWriter.cxx @@ -524,7 +524,7 @@ cmDSPWriter::CreateTargetRules(const cmTarget &target, void cmDSPWriter::WriteDSPHeader(std::ostream& fout, const char *libName, const cmTarget &target, - std::vector<cmSourceGroup> &sourceGroups) + std::vector<cmSourceGroup> &) { // determine the link directories std::string libOptions; diff --git a/Source/cmDSWWriter.cxx b/Source/cmDSWWriter.cxx index e309679..fd6fb07 100644 --- a/Source/cmDSWWriter.cxx +++ b/Source/cmDSWWriter.cxx @@ -216,7 +216,7 @@ void cmDSWWriter::WriteDSWFile(std::ostream& fout) void cmDSWWriter::WriteProject(std::ostream& fout, const char* dspname, const char* dir, - cmDSPWriter* project, + cmDSPWriter*, const cmTarget& target ) { diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index 157531b..903746a 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. bool cmIfFunctionBlocker:: IsFunctionBlocked(const char *name, const std::vector<std::string> &args, - cmMakefile &mf) + cmMakefile &) { if (!strcmp(name,"ELSE") || !strcmp(name,"ENDIF")) { diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index 441ed13..8aafc92 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -286,7 +286,7 @@ void cmUnixMakefileGenerator::OutputIncludeMakefile(std::ostream& fout, std::string -cmUnixMakefileGenerator::GetOutputExtension(const char* sourceExtension) +cmUnixMakefileGenerator::GetOutputExtension(const char*) { return m_ObjectFileExtension; } @@ -601,7 +601,7 @@ void cmUnixMakefileGenerator::OutputModuleLibraryRule(std::ostream& fout, void cmUnixMakefileGenerator::OutputStaticLibraryRule(std::ostream& fout, const char* name, - const cmTarget & t) + const cmTarget &) { std::string target = m_LibraryOutputPath + "lib" + std::string(name) + ".a"; std::string depend = "$("; @@ -628,7 +628,7 @@ void cmUnixMakefileGenerator::OutputStaticLibraryRule(std::ostream& fout, void cmUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout, const char* name, - const cmTarget & t) + const cmTarget &t) { std::string target = m_ExecutableOutputPath + name; std::string depend = "$("; diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 8b15357..7c38113 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -82,7 +82,7 @@ void cmake::Usage(const char* program) } // Parse the args -void cmake::SetCacheArgs(cmMakefile& builder, const std::vector<std::string>& args) +void cmake::SetCacheArgs(cmMakefile& , const std::vector<std::string>& args) { for(unsigned int i=1; i < args.size(); ++i) { |