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

fix warning for Borland build

Browse Source
This commit is contained in:
Sebastien Barre 2001-11-30 17:20:43 -05:00
parent ab46fd164a
commit b180bf609b
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmBuildCommand.cxx
View File

@ -69,10 +69,7 @@ bool cmBuildCommand::InitialPass(std::vector<std::string> const& args)
makecommand += m_Makefile->GetProjectName(); makecommand += m_Makefile->GetProjectName();
makecommand += ".dsw /MAKE \"ALL_BUILD - Release\" "; makecommand += ".dsw /MAKE \"ALL_BUILD - Release\" ";
} }
else if(makeprogram.find("Borland") != std::string::npos || else if(m_Makefile->GetDefinition("BORLAND"))
makeprogram.find("BORLAND") != std::string::npos ||
makeprogram.find("borland") != std::string::npos ||
compiler.find("Borland") != std::string::npos)
{ {
makecommand = makeprogram; makecommand = makeprogram;
makecommand += " -i"; makecommand += " -i";

2
Source/cmDSPWriter.cxx
View File

@ -524,7 +524,7 @@ cmDSPWriter::CreateTargetRules(const cmTarget &target,
void cmDSPWriter::WriteDSPHeader(std::ostream& fout, const char *libName, void cmDSPWriter::WriteDSPHeader(std::ostream& fout, const char *libName,
const cmTarget &target, const cmTarget &target,
std::vector<cmSourceGroup> &sourceGroups) std::vector<cmSourceGroup> &)
{ {
// determine the link directories // determine the link directories
std::string libOptions; std::string libOptions;

2
Source/cmDSWWriter.cxx
View File

@ -216,7 +216,7 @@ void cmDSWWriter::WriteDSWFile(std::ostream& fout)
void cmDSWWriter::WriteProject(std::ostream& fout, void cmDSWWriter::WriteProject(std::ostream& fout,
const char* dspname, const char* dspname,
const char* dir, const char* dir,
cmDSPWriter* project, cmDSPWriter*,
const cmTarget& target const cmTarget& target
) )
{ {

2
Source/cmIfCommand.cxx
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
bool cmIfFunctionBlocker:: bool cmIfFunctionBlocker::
IsFunctionBlocked(const char *name, const std::vector<std::string> &args, IsFunctionBlocked(const char *name, const std::vector<std::string> &args,
cmMakefile &mf) cmMakefile &)
{ {
if (!strcmp(name,"ELSE") || !strcmp(name,"ENDIF")) if (!strcmp(name,"ELSE") || !strcmp(name,"ENDIF"))
{ {

6
Source/cmUnixMakefileGenerator.cxx
View File

@ -286,7 +286,7 @@ void cmUnixMakefileGenerator::OutputIncludeMakefile(std::ostream& fout,
std::string std::string
cmUnixMakefileGenerator::GetOutputExtension(const char* sourceExtension) cmUnixMakefileGenerator::GetOutputExtension(const char*)
{ {
return m_ObjectFileExtension; return m_ObjectFileExtension;
} }
@ -601,7 +601,7 @@ void cmUnixMakefileGenerator::OutputModuleLibraryRule(std::ostream& fout,
void cmUnixMakefileGenerator::OutputStaticLibraryRule(std::ostream& fout, void cmUnixMakefileGenerator::OutputStaticLibraryRule(std::ostream& fout,
const char* name, const char* name,
const cmTarget & t) const cmTarget &)
{ {
std::string target = m_LibraryOutputPath + "lib" + std::string(name) + ".a"; std::string target = m_LibraryOutputPath + "lib" + std::string(name) + ".a";
std::string depend = "$("; std::string depend = "$(";
@ -628,7 +628,7 @@ void cmUnixMakefileGenerator::OutputStaticLibraryRule(std::ostream& fout,
void cmUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout, void cmUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout,
const char* name, const char* name,
const cmTarget & t) const cmTarget &t)
{ {
std::string target = m_ExecutableOutputPath + name; std::string target = m_ExecutableOutputPath + name;
std::string depend = "$("; std::string depend = "$(";

2
Source/cmake.cxx
View File

@ -82,7 +82,7 @@ void cmake::Usage(const char* program)
} }
// Parse the args // 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) for(unsigned int i=1; i < args.size(); ++i)
{ {