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

STYLE: fix line length

This commit is contained in:
Ken Martin 2006-05-12 13:44:15 -04:00
parent 3c4bfa1003
commit 2bb24565e5
4 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmProjectCommand.cxx
View File

@ -31,12 +31,14 @@ bool cmProjectCommand::InitialPass(std::vector<std::string> const& args)
std::string srcdir = args[0]; std::string srcdir = args[0];
srcdir += "_SOURCE_DIR"; srcdir += "_SOURCE_DIR";
this->Makefile->AddCacheDefinition(bindir.c_str(), this->Makefile->AddCacheDefinition
this->Makefile->GetCurrentOutputDirectory(), (bindir.c_str(),
"Value Computed by CMake", cmCacheManager::STATIC); this->Makefile->GetCurrentOutputDirectory(),
this->Makefile->AddCacheDefinition(srcdir.c_str(), "Value Computed by CMake", cmCacheManager::STATIC);
this->Makefile->GetCurrentDirectory(), this->Makefile->AddCacheDefinition
"Value Computed by CMake", cmCacheManager::STATIC); (srcdir.c_str(),
this->Makefile->GetCurrentDirectory(),
"Value Computed by CMake", cmCacheManager::STATIC);
bindir = "PROJECT_BINARY_DIR"; bindir = "PROJECT_BINARY_DIR";
srcdir = "PROJECT_SOURCE_DIR"; srcdir = "PROJECT_SOURCE_DIR";

15
Source/cmQTWrapCPPCommand.cxx
View File

@ -57,9 +57,11 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn)
{ {
file.SetProperty("ABSTRACT",curr->GetProperty("ABSTRACT")); file.SetProperty("ABSTRACT",curr->GetProperty("ABSTRACT"));
} }
std::string srcName = cmSystemTools::GetFilenameWithoutLastExtension(*j); std::string srcName =
cmSystemTools::GetFilenameWithoutLastExtension(*j);
std::string newName = "moc_" + srcName; std::string newName = "moc_" + srcName;
file.SetName(newName.c_str(), this->Makefile->GetCurrentOutputDirectory(), file.SetName(newName.c_str(),
this->Makefile->GetCurrentOutputDirectory(),
"cxx",false); "cxx",false);
std::string hname; std::string hname;
if ( (*j)[0] == '/' || (*j)[1] == ':' ) if ( (*j)[0] == '/' || (*j)[1] == ':' )
@ -70,7 +72,8 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn)
{ {
if ( curr && curr->GetPropertyAsBool("GENERATED") ) if ( curr && curr->GetPropertyAsBool("GENERATED") )
{ {
hname = std::string( this->Makefile->GetCurrentOutputDirectory() ) + "/" + *j; hname = std::string(this->Makefile->GetCurrentOutputDirectory())
+ "/" + *j;
} }
else else
{ {
@ -89,7 +92,8 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn)
} }
} }
this->Makefile->AddDefinition(this->SourceList.c_str(), sourceListValue.c_str()); this->Makefile->AddDefinition(this->SourceList.c_str(),
sourceListValue.c_str());
return true; return true;
} }
@ -99,7 +103,8 @@ void cmQTWrapCPPCommand::FinalPass()
// first we add the rules for all the .h to Moc files // first we add the rules for all the .h to Moc files
size_t lastClass = this->WrapClasses.size(); size_t lastClass = this->WrapClasses.size();
std::vector<std::string> depends; std::vector<std::string> depends;
const char* moc_exe = this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE"); const char* moc_exe =
this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE");
// wrap all the .h files // wrap all the .h files
depends.push_back(moc_exe); depends.push_back(moc_exe);

15
Source/cmQTWrapUICommand.cxx
View File

@ -75,7 +75,8 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn)
{ {
if ( curr && curr->GetPropertyAsBool("GENERATED") ) if ( curr && curr->GetPropertyAsBool("GENERATED") )
{ {
origname = std::string( this->Makefile->GetCurrentOutputDirectory() ) + "/" + *j; origname = std::string(this->Makefile->GetCurrentOutputDirectory())
+ "/" + *j;
} }
else else
{ {
@ -114,8 +115,10 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn)
} }
} }
this->Makefile->AddDefinition(this->SourceList.c_str(), sourceListValue.c_str()); this->Makefile->AddDefinition(this->SourceList.c_str(),
this->Makefile->AddDefinition(this->HeaderList.c_str(), headerListValue.c_str()); sourceListValue.c_str());
this->Makefile->AddDefinition(this->HeaderList.c_str(),
headerListValue.c_str());
return true; return true;
} }
@ -125,8 +128,10 @@ void cmQTWrapUICommand::FinalPass()
// first we add the rules for all the .ui to .h and .cxx files // first we add the rules for all the .ui to .h and .cxx files
size_t lastHeadersClass = this->WrapHeadersClasses.size(); size_t lastHeadersClass = this->WrapHeadersClasses.size();
std::vector<std::string> depends; std::vector<std::string> depends;
const char* uic_exe = this->Makefile->GetRequiredDefinition("QT_UIC_EXECUTABLE"); const char* uic_exe =
const char* moc_exe = this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE"); this->Makefile->GetRequiredDefinition("QT_UIC_EXECUTABLE");
const char* moc_exe =
this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE");
// wrap all the .h files // wrap all the .h files
depends.push_back(uic_exe); depends.push_back(uic_exe);

3
Source/cmRemoveDefinitionsCommand.cxx
View File

@ -17,7 +17,8 @@
#include "cmRemoveDefinitionsCommand.h" #include "cmRemoveDefinitionsCommand.h"
// cmRemoveDefinitionsCommand // cmRemoveDefinitionsCommand
bool cmRemoveDefinitionsCommand::InitialPass(std::vector<std::string> const& args) bool cmRemoveDefinitionsCommand
::InitialPass(std::vector<std::string> const& args)
{ {
// it is OK to have no arguments // it is OK to have no arguments
if(args.size() < 1 ) if(args.size() < 1 )