Browse Source

fix warning for Borland build

Sebastien Barre 24 years ago
parent
commit
b180bf609b

+ 1 - 4
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";

+ 1 - 1
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;

+ 1 - 1
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
                                  )
 {

+ 1 - 1
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"))
     {

+ 3 - 3
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 = "$(";

+ 1 - 1
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)
     {