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

added Code Warrior dev

Browse Source
This commit is contained in:
Ken Martin 2002-10-09 13:37:27 -04:00
parent 4e3d4e712c
commit e55a05a6f6
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Source/cmake.cxx
View File

@ -30,6 +30,7 @@
#include "cmGlobalNMakeMakefileGenerator.h" #include "cmGlobalNMakeMakefileGenerator.h"
#include "cmWin32ProcessExecution.h" #include "cmWin32ProcessExecution.h"
#else #else
#include "cmGlobalCodeWarriorGenerator.h"
#include "cmGlobalUnixMakefileGenerator.h" #include "cmGlobalUnixMakefileGenerator.h"
#endif #endif
@ -112,7 +113,7 @@ void cmake::Usage(const char* program)
{ {
errorStream << "\"" << i->c_str() << "\" "; errorStream << "\"" << i->c_str() << "\" ";
} }
errorStream << ")\n"; errorStream << ")\n";
cmSystemTools::Error(errorStream.str().c_str()); cmSystemTools::Error(errorStream.str().c_str());
} }
@ -198,16 +199,16 @@ void cmake::SetArgs(const std::vector<std::string>& args)
if (args.size() == 2) if (args.size() == 2)
{ {
this->SetHomeDirectory this->SetHomeDirectory
(cmSystemTools::CollapseFullPath(args[1].c_str()).c_str()); (cmSystemTools::CollapseFullPath(args[1].c_str()).c_str());
this->SetStartDirectory this->SetStartDirectory
(cmSystemTools::CollapseFullPath(args[1].c_str()).c_str()); (cmSystemTools::CollapseFullPath(args[1].c_str()).c_str());
} }
else else
{ {
this->SetHomeDirectory this->SetHomeDirectory
(cmSystemTools::GetCurrentWorkingDirectory().c_str()); (cmSystemTools::GetCurrentWorkingDirectory().c_str());
this->SetStartDirectory this->SetStartDirectory
(cmSystemTools::GetCurrentWorkingDirectory().c_str()); (cmSystemTools::GetCurrentWorkingDirectory().c_str());
} }
} }
@ -241,7 +242,7 @@ void cmake::SetArgs(const std::vector<std::string>& args)
} }
else if(arg.find("-V",0) == 0) else if(arg.find("-V",0) == 0)
{ {
m_Verbose = true; m_Verbose = true;
} }
else if(arg.find("-D",0) == 0) else if(arg.find("-D",0) == 0)
{ {
@ -483,9 +484,9 @@ int cmake::CMakeCommand(std::vector<std::string>& args)
{ {
unsigned int cc; unsigned int cc;
for ( cc = 2; cc < args.size(); cc ++ ) for ( cc = 2; cc < args.size(); cc ++ )
{ {
std::cout << args[cc] << " "; std::cout << args[cc] << " ";
} }
std::cout << std::endl; std::cout << std::endl;
return 0; return 0;
} }
@ -494,7 +495,7 @@ int cmake::CMakeCommand(std::vector<std::string>& args)
else if (args[1] == "remove" && args.size() > 2) else if (args[1] == "remove" && args.size() > 2)
{ {
for (std::string::size_type cc = 2; cc < args.size(); cc ++) for (std::string::size_type cc = 2; cc < args.size(); cc ++)
{ {
if(args[cc] != "-f") if(args[cc] != "-f")
{ {
if(args[cc] == "\\-f") if(args[cc] == "\\-f")
@ -503,7 +504,7 @@ int cmake::CMakeCommand(std::vector<std::string>& args)
} }
cmSystemTools::RemoveFile(args[cc].c_str()); cmSystemTools::RemoveFile(args[cc].c_str());
} }
} }
return 0; return 0;
} }
@ -513,10 +514,10 @@ int cmake::CMakeCommand(std::vector<std::string>& args)
std::string command = args[2]; std::string command = args[2];
std::string output; std::string output;
for (std::string::size_type cc = 3; cc < args.size(); cc ++) for (std::string::size_type cc = 3; cc < args.size(); cc ++)
{ {
command += " "; command += " ";
command += args[cc]; command += args[cc];
} }
clock_t clock_start, clock_finish; clock_t clock_start, clock_finish;
time_t time_start, time_finish; time_t time_start, time_finish;
@ -548,18 +549,18 @@ int cmake::CMakeCommand(std::vector<std::string>& args)
std::string command = args[3]; std::string command = args[3];
std::string output; std::string output;
for (std::string::size_type cc = 4; cc < args.size(); cc ++) for (std::string::size_type cc = 4; cc < args.size(); cc ++)
{ {
command += " "; command += " ";
command += args[cc]; command += args[cc];
} }
int retval = 0; int retval = 0;
if ( cmSystemTools::RunCommand(command.c_str(), output, retval, if ( cmSystemTools::RunCommand(command.c_str(), output, retval,
directory.c_str(), false) ) directory.c_str(), false) )
{ {
std::cout << output.c_str(); std::cout << output.c_str();
return retval; return retval;
} }
return 1; return 1;
} }
@ -583,9 +584,9 @@ int cmake::CMakeCommand(std::vector<std::string>& args)
unsigned int cc; unsigned int cc;
std::string command = args[2]; std::string command = args[2];
for ( cc = 3; cc < args.size(); cc ++ ) for ( cc = 3; cc < args.size(); cc ++ )
{ {
command += " " + args[cc]; command += " " + args[cc];
} }
return cmWin32ProcessExecution::Windows9xHack(command.c_str()); return cmWin32ProcessExecution::Windows9xHack(command.c_str());
} }
#endif #endif
@ -603,6 +604,7 @@ void cmake::GetRegisteredGenerators(std::vector<std::string>& names)
names.push_back(cmGlobalBorlandMakefileGenerator::GetActualName()); names.push_back(cmGlobalBorlandMakefileGenerator::GetActualName());
names.push_back(cmGlobalNMakeMakefileGenerator::GetActualName()); names.push_back(cmGlobalNMakeMakefileGenerator::GetActualName());
#else #else
names.push_back(cmGlobalCodeWarriorGenerator::GetActualName());
names.push_back(cmGlobalUnixMakefileGenerator::GetActualName()); names.push_back(cmGlobalUnixMakefileGenerator::GetActualName());
#endif #endif
} }
@ -632,6 +634,11 @@ cmGlobalGenerator* cmake::CreateGlobalGenerator(const char* name)
ret->SetCMakeInstance(this); ret->SetCMakeInstance(this);
} }
#else #else
if (!strcmp(name,cmGlobalCodeWarriorGenerator::GetActualName()))
{
ret = new cmGlobalCodeWarriorGenerator;
ret->SetCMakeInstance(this);
}
if (!strcmp(name,cmGlobalUnixMakefileGenerator::GetActualName())) if (!strcmp(name,cmGlobalUnixMakefileGenerator::GetActualName()))
{ {
ret = new cmGlobalUnixMakefileGenerator; ret = new cmGlobalUnixMakefileGenerator;