[cmake-commits] alex committed cmDocumentation.cxx 1.47 1.48
cmExportCommand.h 1.2 1.3 cmExtraCodeBlocksGenerator.cxx 1.2
1.3 cmExtraCodeBlocksGenerator.h 1.1 1.2 cmFileCommand.cxx 1.87
1.88 cmGlobalGenerator.cxx 1.197 1.198 cmGlobalGenerator.h 1.89
1.90 cmHexFileConverter.cxx 1.4 1.5
cmIncludeExternalMSProjectCommand.cxx 1.20 1.21 cmMakefile.cxx
1.406 1.407 cmMakefile.h 1.212 1.213 cmTryCompileCommand.h 1.23
1.24 cmTryRunCommand.h 1.12 1.13 cmake.h 1.86 1.87
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Jul 20 08:36:18 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv6245
Modified Files:
cmDocumentation.cxx cmExportCommand.h
cmExtraCodeBlocksGenerator.cxx cmExtraCodeBlocksGenerator.h
cmFileCommand.cxx cmGlobalGenerator.cxx cmGlobalGenerator.h
cmHexFileConverter.cxx cmIncludeExternalMSProjectCommand.cxx
cmMakefile.cxx cmMakefile.h cmTryCompileCommand.h
cmTryRunCommand.h cmake.h
Log Message:
STYLE: fix line lengths
Alex
Index: cmTryRunCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTryRunCommand.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cmTryRunCommand.h 1 Jun 2007 15:16:29 -0000 1.12
+++ cmTryRunCommand.h 20 Jul 2007 12:36:16 -0000 1.13
@@ -102,8 +102,11 @@
cmTypeMacro(cmTryRunCommand, cmCoreTryCompile);
private:
- void RunExecutable(const std::string& runArgs, std::string* runOutputContents);
- void DoNotRunExecutable(const std::string& runArgs, const std::string& srcFile, std::string* runOutputContents);
+ void RunExecutable(const std::string& runArgs,
+ std::string* runOutputContents);
+ void DoNotRunExecutable(const std::string& runArgs,
+ const std::string& srcFile,
+ std::string* runOutputContents);
std::string CompileResultVariable;
std::string RunResultVariable;
Index: cmExtraCodeBlocksGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraCodeBlocksGenerator.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cmExtraCodeBlocksGenerator.h 13 Jul 2007 04:58:43 -0000 1.1
+++ cmExtraCodeBlocksGenerator.h 20 Jul 2007 12:36:16 -0000 1.2
@@ -35,10 +35,10 @@
virtual void SetGlobalGenerator(cmGlobalGenerator* generator);
virtual const char* GetName() const
- { return cmExtraCodeBlocksGenerator::GetActualName();}
- static const char* GetActualName() { return "CodeBlocks";}
+ { return cmExtraCodeBlocksGenerator::GetActualName();}
+ static const char* GetActualName() { return "CodeBlocks";}
static cmExternalMakefileProjectGenerator* New()
- { return new cmExtraCodeBlocksGenerator; }
+ { return new cmExtraCodeBlocksGenerator; }
/** Get the documentation entry for this generator. */
virtual void GetDocumentation(cmDocumentationEntry& entry,
const char* fullName) const;
Index: cmake.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- cmake.h 11 Jul 2007 19:53:58 -0000 1.86
+++ cmake.h 20 Jul 2007 12:36:16 -0000 1.87
@@ -336,7 +336,8 @@
void AddDefaultCommands();
void AddDefaultGenerators();
void AddDefaultExtraGenerators();
- void AddExtraGenerator(const char* name, CreateExtraGeneratorFunctionType newFunction);
+ void AddExtraGenerator(const char* name,
+ CreateExtraGeneratorFunctionType newFunction);
cmGlobalGenerator *GlobalGenerator;
cmCacheManager *CacheManager;
Index: cmGlobalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.h,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- cmGlobalGenerator.h 17 Jul 2007 13:25:08 -0000 1.89
+++ cmGlobalGenerator.h 20 Jul 2007 12:36:16 -0000 1.90
@@ -179,7 +179,9 @@
void FindMakeProgram(cmMakefile*);
///! Find a target by name by searching the local generators.
- cmTarget* FindTarget(const char* project, const char* name, bool useImportedTargets);
+ cmTarget* FindTarget(const char* project,
+ const char* name,
+ bool useImportedTargets);
/** If check to see if the target is linked to by any other
target in the project */
@@ -218,7 +220,8 @@
// what targets does the specified target depend on
std::vector<cmTarget *>& GetTargetDepends(cmTarget& target);
- const std::map<cmStdString, std::vector<cmLocalGenerator*> >& GetProjectMap() const {return this->ProjectMap;}
+ const std::map<cmStdString, std::vector<cmLocalGenerator*> >& GetProjectMap()
+ const {return this->ProjectMap;}
protected:
void SetLanguageEnabledFlag(const char* l, cmMakefile* mf);
void SetLanguageEnabledMaps(const char* l, cmMakefile* mf);
Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- cmGlobalGenerator.cxx 17 Jul 2007 13:25:08 -0000 1.197
+++ cmGlobalGenerator.cxx 20 Jul 2007 12:36:16 -0000 1.198
@@ -1144,7 +1144,8 @@
int cmGlobalGenerator::GetLinkerPreference(const char* lang)
{
- std::map<cmStdString, int>::const_iterator it = this->LanguageToLinkerPreference.find(lang);
+ std::map<cmStdString, int>::const_iterator it =
+ this->LanguageToLinkerPreference.find(lang);
if (it != this->LanguageToLinkerPreference.end())
{
return it->second;
@@ -1287,7 +1288,7 @@
for(unsigned int i = 0; i < gens->size(); ++i)
{
cmTarget* ret = (*gens)[i]->GetMakefile()->FindTarget(name,
- useImportedTargets);
+ useImportedTargets);
if(ret)
{
return ret;
@@ -1551,9 +1552,10 @@
{
cmCustomCommandLine localCmdLine = singleLine;
- localCmdLine.insert(localCmdLine.begin()+1, "-DCMAKE_INSTALL_LOCAL_ONLY=1");
+ localCmdLine.insert(localCmdLine.begin()+1,
+ "-DCMAKE_INSTALL_LOCAL_ONLY=1");
cpackCommandLines.erase(cpackCommandLines.begin(),
- cpackCommandLines.end());
+ cpackCommandLines.end());
cpackCommandLines.push_back(localCmdLine);
(*targets)[install_local] =
@@ -1684,7 +1686,7 @@
// Don't emit the same utility twice for this target.
if(emitted.insert(*util).second)
{
- cmTarget *target2 = target.GetMakefile()->FindTarget(util->c_str(), false);
+ cmTarget *target2=target.GetMakefile()->FindTarget(util->c_str(), false);
// search each local generator until a match is found
if (!target2)
Index: cmFileCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFileCommand.cxx,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- cmFileCommand.cxx 2 Jul 2007 20:04:14 -0000 1.87
+++ cmFileCommand.cxx 20 Jul 2007 12:36:16 -0000 1.88
@@ -429,7 +429,7 @@
std::string binaryFileName = this->Makefile->GetCurrentOutputDirectory();
binaryFileName += cmake::GetCMakeFilesDirectory();
binaryFileName += "/FileCommandStringsBinaryFile";
- if (cmHexFileConverter::TryConvert(fileName.c_str(), binaryFileName.c_str()))
+ if(cmHexFileConverter::TryConvert(fileName.c_str(),binaryFileName.c_str()))
{
fileName = binaryFileName;
}
Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- cmMakefile.h 28 Jun 2007 13:09:26 -0000 1.212
+++ cmMakefile.h 20 Jul 2007 12:36:16 -0000 1.213
@@ -167,7 +167,9 @@
void AddDefineFlag(const char* definition);
void RemoveDefineFlag(const char* definition);
- cmTarget* AddNewTarget(cmTarget::TargetType type, const char* name, bool isImported);
+ cmTarget* AddNewTarget(cmTarget::TargetType type,
+ const char* name,
+ bool isImported);
/**
* Add an executable to the build.
Index: cmIncludeExternalMSProjectCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIncludeExternalMSProjectCommand.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cmIncludeExternalMSProjectCommand.cxx 22 May 2007 15:05:59 -0000 1.20
+++ cmIncludeExternalMSProjectCommand.cxx 20 Jul 2007 12:36:16 -0000 1.21
@@ -50,7 +50,9 @@
cmSystemTools::ConvertToUnixSlashes(path);
// Create a target instance for this utility.
- cmTarget* target=this->Makefile->AddNewTarget(cmTarget::UTILITY, utility_name.c_str(), false);
+ cmTarget* target=this->Makefile->AddNewTarget(cmTarget::UTILITY,
+ utility_name.c_str(),
+ false);
target->SetProperty("EXCLUDE_FROM_ALL","FALSE");
std::vector<std::string> no_outputs;
cmCustomCommandLines commandLines;
Index: cmDocumentation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDocumentation.cxx,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- cmDocumentation.cxx 11 Jul 2007 19:53:58 -0000 1.47
+++ cmDocumentation.cxx 20 Jul 2007 12:36:16 -0000 1.48
@@ -50,7 +50,8 @@
static const cmDocumentationEntry cmModulesDocumentationDescription[] =
{
{0,
- " CMake Modules - Modules coming with CMake, the Cross-Platform Makefile Generator.", 0},
+ " CMake Modules - Modules coming with CMake, the Cross-Platform Makefile "
+ "Generator.", 0},
// CMAKE_DOCUMENTATION_OVERVIEW,
{0,
"This is the documentation for the modules and scripts coming with CMake. "
@@ -69,10 +70,10 @@
// CMAKE_DOCUMENTATION_OVERVIEW,
{0,
"This is the documentation for the properties supported by CMake. "
- "Properties can have different scopes. They can either be assigned to a source file, "
- "a directory, a target or globally to CMake. "
- "By modifying the values of properties the behaviour of the buildsystem can be "
- "customized.", 0},
+ "Properties can have different scopes. They can either be assigned to a "
+ "source file, a directory, a target or globally to CMake. By modifying the "
+ "values of properties the behaviour of the buildsystem can be customized.",
+ 0},
{0,0,0}
};
@@ -84,9 +85,9 @@
"Obsolete commands supported by CMake for compatibility.", 0},
// CMAKE_DOCUMENTATION_OVERVIEW,
{0,
- "This is the documentation for now obsolete listfile commands from "
- "previous CMake versions, which are still supported for compatibility reasons. "
- "You should instead use the newer, faster and shinier new commands. ;-)", 0},
+ "This is the documentation for now obsolete listfile commands from previous "
+ "CMake versions, which are still supported for compatibility reasons. You "
+ "should instead use the newer, faster and shinier new commands. ;-)", 0},
{0,0,0}
};
@@ -813,7 +814,7 @@
break;
case cmProperty::DIRECTORY:
this->DirectoryPropertiesSection.Set(
- cmDocumentationDirectoryPropertiesHeader, section, 0);
+ cmDocumentationDirectoryPropertiesHeader, section, 0);
break;
case cmProperty::TARGET:
this->TargetPropertiesSection.Set(
Index: cmExportCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExportCommand.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cmExportCommand.h 2 Jul 2007 19:43:21 -0000 1.2
+++ cmExportCommand.h 20 Jul 2007 12:36:16 -0000 1.3
@@ -63,7 +63,8 @@
virtual const char* GetFullDocumentation()
{
return
- " EXPORT(TARGETS tgt1 tgt2 ... [PREFIX <prefix>] FILE <filename> [APPEND])\n"
+ " EXPORT(TARGETS tgt1 tgt2 ... [PREFIX <prefix>] FILE <filename> "
+ "[APPEND])\n"
"Create a file that can be included into a CMake listfile with the "
"INCLUDE command. The file will contain a number of SET commands "
"that will set all the variables needed for library dependency "
Index: cmHexFileConverter.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmHexFileConverter.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cmHexFileConverter.cxx 29 May 2007 12:42:39 -0000 1.4
+++ cmHexFileConverter.cxx 20 Jul 2007 12:36:16 -0000 1.5
@@ -153,7 +153,8 @@
dataStart = 9;
}
// ignore extra address records
- else if ((buf[8] == '2') || (buf[8] == '3') || (buf[8] == '4') || (buf[8] == '5'))
+ else if ((buf[8] == '2') || (buf[8] == '3') || (buf[8] == '4')
+ || (buf[8] == '5'))
{
return true;
}
Index: cmExtraCodeBlocksGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraCodeBlocksGenerator.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cmExtraCodeBlocksGenerator.cxx 18 Jul 2007 14:19:33 -0000 1.2
+++ cmExtraCodeBlocksGenerator.cxx 20 Jul 2007 12:36:16 -0000 1.3
@@ -67,7 +67,8 @@
void cmExtraCodeBlocksGenerator::Generate()
{
- const cmMakefile* topLevelMakefile = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
+ const cmMakefile* topLevelMakefile =
+ this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
std::string workspaceName = topLevelMakefile->GetProjectName();
std::string outputDir=topLevelMakefile->GetStartOutputDirectory();
@@ -119,7 +120,8 @@
/* create the project file, if it already exists, merge it with the
existing one, otherwise create a new one */
-void cmExtraCodeBlocksGenerator::CreateProjectFile(const std::vector<cmLocalGenerator*>& lgs)
+void cmExtraCodeBlocksGenerator::CreateProjectFile(
+ const std::vector<cmLocalGenerator*>& lgs)
{
const cmMakefile* mf=lgs[0]->GetMakefile();
std::string outputDir=mf->GetStartOutputDirectory();
@@ -245,7 +247,7 @@
case cmTarget::SHARED_LIBRARY:
case cmTarget::MODULE_LIBRARY:
{
- const std::vector<cmSourceFile*>& sources=ti->second.GetSourceFiles();
+ const std::vector<cmSourceFile*>&sources=ti->second.GetSourceFiles();
for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
si!=sources.end(); si++)
{
@@ -258,7 +260,8 @@
}
}
- for (std::map<std::string, std::string>::const_iterator sit=sourceFiles.begin();
+ for (std::map<std::string, std::string>::const_iterator
+ sit=sourceFiles.begin();
sit!=sourceFiles.end();
++sit)
{
Index: cmTryCompileCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTryCompileCommand.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- cmTryCompileCommand.h 24 May 2007 16:06:59 -0000 1.23
+++ cmTryCompileCommand.h 20 Jul 2007 12:36:16 -0000 1.24
@@ -62,9 +62,9 @@
" TRY_COMPILE(RESULT_VAR bindir srcdir\n"
" projectName <targetname> [CMAKE_FLAGS <Flags>]\n"
" [OUTPUT_VARIABLE var])\n"
- "Try compiling a program. In this form, srcdir should contain a complete "
- "CMake project with a CMakeLists.txt file and all sources. The bindir and "
- "srcdir will not be deleted after this command is run. "
+ "Try compiling a program. In this form, srcdir should contain a "
+ "complete CMake project with a CMakeLists.txt file and all sources. The "
+ "bindir and srcdir will not be deleted after this command is run. "
"If <target name> is specified then build just that target "
"otherwise the all or ALL_BUILD target is built.\n"
" TRY_COMPILE(RESULT_VAR bindir srcfile\n"
Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -d -r1.406 -r1.407
--- cmMakefile.cxx 19 Jul 2007 15:13:01 -0000 1.406
+++ cmMakefile.cxx 20 Jul 2007 12:36:16 -0000 1.407
@@ -939,7 +939,7 @@
if ( i != this->Targets.end())
{
cmTarget* tgt =
- this->GetCMakeInstance()->GetGlobalGenerator()->FindTarget(0, lib, false);
+ this->GetCMakeInstance()->GetGlobalGenerator()->FindTarget(0,lib,false);
if(tgt)
{
bool allowModules = true;
More information about the Cmake-commits
mailing list