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

ENH: fix linelength

This commit is contained in:
Ken Martin 2006-06-15 11:51:51 -04:00
parent 4c2c2cfd68
commit 6071052835
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGlobalKdevelopGenerator.cxx
View File

@ -162,7 +162,8 @@ bool cmGlobalKdevelopGenerator
tmp=(*si)->GetFullPath(); tmp=(*si)->GetFullPath();
cmSystemTools::ReplaceString(tmp, projectDir.c_str(), ""); cmSystemTools::ReplaceString(tmp, projectDir.c_str(), "");
if ((tmp[0]!='/') && if ((tmp[0]!='/') &&
(strstr(tmp.c_str(), cmake::GetCMakeFilesDirectoryPostSlash())==0)) (strstr(tmp.c_str(),
cmake::GetCMakeFilesDirectoryPostSlash())==0))
{ {
files.insert(tmp); files.insert(tmp);
} }
@ -173,7 +174,8 @@ bool cmGlobalKdevelopGenerator
tmp=*lt; tmp=*lt;
cmSystemTools::ReplaceString(tmp, projectDir.c_str(), ""); cmSystemTools::ReplaceString(tmp, projectDir.c_str(), "");
if ((tmp[0]!='/') && if ((tmp[0]!='/') &&
(strstr(tmp.c_str(), cmake::GetCMakeFilesDirectoryPostSlash())==0)) (strstr(tmp.c_str(),
cmake::GetCMakeFilesDirectoryPostSlash())==0))
{ {
files.insert(tmp.c_str()); files.insert(tmp.c_str());
} }

6
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -1461,7 +1461,8 @@ void cmLocalUnixMakefileGenerator3
std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash(); std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash();
mf2Dir += "Makefile2"; mf2Dir += "Makefile2";
commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),dir.c_str())); commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
dir.c_str()));
this->CreateCDCommand(commands, this->CreateCDCommand(commands,
this->Makefile->GetHomeOutputDirectory(), this->Makefile->GetHomeOutputDirectory(),
this->Makefile->GetStartOutputDirectory()); this->Makefile->GetStartOutputDirectory());
@ -1486,7 +1487,8 @@ void cmLocalUnixMakefileGenerator3
dir = this->Convert(dir.c_str(),HOME_OUTPUT,MAKEFILE); dir = this->Convert(dir.c_str(),HOME_OUTPUT,MAKEFILE);
commands.clear(); commands.clear();
depends.clear(); depends.clear();
commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),dir.c_str())); commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
dir.c_str()));
this->CreateCDCommand(commands, this->CreateCDCommand(commands,
this->Makefile->GetHomeOutputDirectory(), this->Makefile->GetHomeOutputDirectory(),
this->Makefile->GetStartOutputDirectory()); this->Makefile->GetStartOutputDirectory());

3
Source/cmake.h
View File

@ -69,7 +69,8 @@ class cmake
///! construct an instance of cmake ///! construct an instance of cmake
static const char *GetCMakeFilesDirectory() {return "/CMakeFiles";}; static const char *GetCMakeFilesDirectory() {return "/CMakeFiles";};
static const char *GetCMakeFilesDirectoryPostSlash() {return "CMakeFiles/";}; static const char *GetCMakeFilesDirectoryPostSlash() {
return "CMakeFiles/";};
//@{ //@{
/** /**