summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/cmCommandArgumentLexer.h30
-rw-r--r--Source/cmDependsFortranParserTokens.h4
-rw-r--r--Source/cmDependsJavaLexer.h24
-rw-r--r--Source/cmDependsJavaParserHelper.h3
-rw-r--r--Source/cmDependsJavaParserTokens.h4
-rw-r--r--Source/cmExecProgramCommand.h4
-rw-r--r--Source/cmExprLexer.h18
-rw-r--r--Source/cmExprParserTokens.h4
-rw-r--r--Source/cmFLTKWrapUICommand.h3
-rw-r--r--Source/cmFileCommand.h3
-rw-r--r--Source/cmFindBase.h5
-rw-r--r--Source/cmGlobalBorlandMakefileGenerator.h6
-rw-r--r--Source/cmGlobalGenerator.h12
-rw-r--r--Source/cmGlobalMSYSMakefileGenerator.h3
-rw-r--r--Source/cmGlobalMinGWMakefileGenerator.h3
-rw-r--r--Source/cmGlobalNMakeMakefileGenerator.h3
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.h3
-rw-r--r--Source/cmGlobalVisualStudio6Generator.h7
-rw-r--r--Source/cmGlobalVisualStudio71Generator.h9
-rw-r--r--Source/cmGlobalVisualStudio7Generator.h13
-rw-r--r--Source/cmGlobalWatcomWMakeGenerator.h3
-rw-r--r--Source/cmGlobalXCodeGenerator.h7
-rw-r--r--Source/cmListCommand.h7
-rw-r--r--Source/cmLocalGenerator.h9
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.h3
-rw-r--r--Source/cmSourceFile.cxx3
-rw-r--r--Source/cmStringCommand.cxx51
-rw-r--r--Source/cmSystemTools.cxx73
-rw-r--r--Source/cmTarget.cxx43
-rw-r--r--Source/cmTargetLinkLibrariesCommand.cxx6
-rw-r--r--Source/cmTryCompileCommand.cxx12
-rw-r--r--Source/cmTryRunCommand.cxx5
-rw-r--r--Source/cmUseMangledMesaCommand.cxx6
-rw-r--r--Source/cmUtilitySourceCommand.cxx3
-rw-r--r--Source/cmVTKMakeInstantiatorCommand.cxx15
-rw-r--r--Source/cmVTKWrapJavaCommand.cxx12
-rw-r--r--Source/cmVTKWrapPythonCommand.cxx18
-rw-r--r--Source/cmVTKWrapTclCommand.cxx6
-rw-r--r--Source/cmVariableRequiresCommand.cxx10
-rw-r--r--Source/cmVariableWatch.cxx9
-rw-r--r--Source/cmVariableWatch.h3
-rw-r--r--Source/cmWhileCommand.cxx6
-rw-r--r--Source/cmWin32ProcessExecution.cxx3
-rw-r--r--Source/cmXCode21Object.cxx12
-rw-r--r--Source/cmXCodeObject.cxx6
-rw-r--r--Source/cmakemain.cxx16
46 files changed, 339 insertions, 169 deletions
diff --git a/Source/cmCommandArgumentLexer.h b/Source/cmCommandArgumentLexer.h
index 8017285..f5209df 100644
--- a/Source/cmCommandArgumentLexer.h
+++ b/Source/cmCommandArgumentLexer.h
@@ -189,16 +189,24 @@ struct yy_buffer_state
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
void cmCommandArgument_yyrestart (FILE *input_file ,yyscan_t yyscanner );
-void cmCommandArgument_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-YY_BUFFER_STATE cmCommandArgument_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
-void cmCommandArgument_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void cmCommandArgument_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void cmCommandArgument_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
+void cmCommandArgument_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,
+ yyscan_t yyscanner );
+YY_BUFFER_STATE cmCommandArgument_yy_create_buffer (FILE *file,int size ,
+ yyscan_t yyscanner );
+void cmCommandArgument_yy_delete_buffer (YY_BUFFER_STATE b ,
+ yyscan_t yyscanner );
+void cmCommandArgument_yy_flush_buffer (YY_BUFFER_STATE b ,
+ yyscan_t yyscanner );
+void cmCommandArgument_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,
+ yyscan_t yyscanner );
void cmCommandArgument_yypop_buffer_state (yyscan_t yyscanner );
-YY_BUFFER_STATE cmCommandArgument_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
-YY_BUFFER_STATE cmCommandArgument_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE cmCommandArgument_yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
+YY_BUFFER_STATE cmCommandArgument_yy_scan_buffer (char *base,yy_size_t size ,
+ yyscan_t yyscanner );
+YY_BUFFER_STATE cmCommandArgument_yy_scan_string (yyconst char *yy_str ,
+ yyscan_t yyscanner );
+YY_BUFFER_STATE cmCommandArgument_yy_scan_bytes (yyconst char *bytes,int len ,
+ yyscan_t yyscanner );
void *cmCommandArgument_yyalloc (yy_size_t ,yyscan_t yyscanner );
void *cmCommandArgument_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
@@ -231,7 +239,8 @@ void cmCommandArgument_yyset_debug (int debug_flag ,yyscan_t yyscanner );
YY_EXTRA_TYPE cmCommandArgument_yyget_extra (yyscan_t yyscanner );
-void cmCommandArgument_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
+void cmCommandArgument_yyset_extra (YY_EXTRA_TYPE user_defined ,
+ yyscan_t yyscanner );
FILE *cmCommandArgument_yyget_in (yyscan_t yyscanner );
@@ -294,7 +303,8 @@ extern int cmCommandArgument_yylex (yyscan_t yyscanner);
#define YY_DECL int cmCommandArgument_yylex (yyscan_t yyscanner)
#endif /* !YY_DECL */
-/* yy_get_previous_state - get the state just before the EOB char was reached */
+/* yy_get_previous_state - get the state just before
+ the EOB char was reached */
#undef YY_NEW_FILE
#undef YY_FLUSH_BUFFER
diff --git a/Source/cmDependsFortranParserTokens.h b/Source/cmDependsFortranParserTokens.h
index dec369e..055be92 100644
--- a/Source/cmDependsFortranParserTokens.h
+++ b/Source/cmDependsFortranParserTokens.h
@@ -1,7 +1,7 @@
/* A Bison parser, made by GNU Bison 1.875d. */
-/* Skeleton parser for Yacc-like parsing with Bison,
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Skeleton parser for Yacc-like parsing with Bison, Copyright (C) 1984,
+ 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Source/cmDependsJavaLexer.h b/Source/cmDependsJavaLexer.h
index 9b780a1..c32a364 100644
--- a/Source/cmDependsJavaLexer.h
+++ b/Source/cmDependsJavaLexer.h
@@ -185,16 +185,22 @@ struct yy_buffer_state
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
void cmDependsJava_yyrestart (FILE *input_file ,yyscan_t yyscanner );
-void cmDependsJava_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-YY_BUFFER_STATE cmDependsJava_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
+void cmDependsJava_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,
+ yyscan_t yyscanner );
+YY_BUFFER_STATE cmDependsJava_yy_create_buffer (FILE *file,int size ,
+ yyscan_t yyscanner );
void cmDependsJava_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void cmDependsJava_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void cmDependsJava_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
+void cmDependsJava_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,
+ yyscan_t yyscanner );
void cmDependsJava_yypop_buffer_state (yyscan_t yyscanner );
-YY_BUFFER_STATE cmDependsJava_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
-YY_BUFFER_STATE cmDependsJava_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE cmDependsJava_yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
+YY_BUFFER_STATE cmDependsJava_yy_scan_buffer (char *base,yy_size_t size ,
+ yyscan_t yyscanner );
+YY_BUFFER_STATE cmDependsJava_yy_scan_string (yyconst char *yy_str ,
+ yyscan_t yyscanner );
+YY_BUFFER_STATE cmDependsJava_yy_scan_bytes (yyconst char *bytes,int len ,
+ yyscan_t yyscanner );
void *cmDependsJava_yyalloc (yy_size_t ,yyscan_t yyscanner );
void *cmDependsJava_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
@@ -229,7 +235,8 @@ void cmDependsJava_yyset_debug (int debug_flag ,yyscan_t yyscanner );
YY_EXTRA_TYPE cmDependsJava_yyget_extra (yyscan_t yyscanner );
-void cmDependsJava_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
+void cmDependsJava_yyset_extra (YY_EXTRA_TYPE user_defined ,
+ yyscan_t yyscanner );
FILE *cmDependsJava_yyget_in (yyscan_t yyscanner );
@@ -292,7 +299,8 @@ extern int cmDependsJava_yylex (yyscan_t yyscanner);
#define YY_DECL int cmDependsJava_yylex (yyscan_t yyscanner)
#endif /* !YY_DECL */
-/* yy_get_previous_state - get the state just before the EOB char was reached */
+/* yy_get_previous_state - get the state just before the
+ EOB char was reached */
#undef YY_NEW_FILE
#undef YY_FLUSH_BUFFER
diff --git a/Source/cmDependsJavaParserHelper.h b/Source/cmDependsJavaParserHelper.h
index a84a659..cf5d29a 100644
--- a/Source/cmDependsJavaParserHelper.h
+++ b/Source/cmDependsJavaParserHelper.h
@@ -75,7 +75,8 @@ private:
cmStdString Name;
std::vector<CurrentClass> NestedClasses;
CurrentClass() {}
- void AddFileNamesForPrinting(std::vector<cmStdString> *files, const char* prefix, const char* sep);
+ void AddFileNamesForPrinting(std::vector<cmStdString> *files,
+ const char* prefix, const char* sep);
};
cmStdString CurrentPackage;
cmStdString::size_type InputBufferPos;
diff --git a/Source/cmDependsJavaParserTokens.h b/Source/cmDependsJavaParserTokens.h
index 5711ac3..c7a414f 100644
--- a/Source/cmDependsJavaParserTokens.h
+++ b/Source/cmDependsJavaParserTokens.h
@@ -1,7 +1,7 @@
/* A Bison parser, made by GNU Bison 1.875d. */
-/* Skeleton parser for Yacc-like parsing with Bison,
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Skeleton parser for Yacc-like parsing with Bison, Copyright (C) 1984,
+ 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Source/cmExecProgramCommand.h b/Source/cmExecProgramCommand.h
index 1a5ff17..339bda8 100644
--- a/Source/cmExecProgramCommand.h
+++ b/Source/cmExecProgramCommand.h
@@ -59,7 +59,9 @@ public:
*/
virtual const char* GetTerseDocumentation()
{
- return "Run and executable program during the processing of the CMakeList.txt file.";
+ return
+ "Run and executable program during the processing of the CMakeList.txt"
+ " file.";
}
/**
diff --git a/Source/cmExprLexer.h b/Source/cmExprLexer.h
index ce20bfd..2804528 100644
--- a/Source/cmExprLexer.h
+++ b/Source/cmExprLexer.h
@@ -189,16 +189,22 @@ struct yy_buffer_state
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
void cmExpr_yyrestart (FILE *input_file ,yyscan_t yyscanner );
-void cmExpr_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-YY_BUFFER_STATE cmExpr_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
+void cmExpr_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,
+ yyscan_t yyscanner );
+YY_BUFFER_STATE cmExpr_yy_create_buffer (FILE *file,int size ,
+ yyscan_t yyscanner );
void cmExpr_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
void cmExpr_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void cmExpr_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
+void cmExpr_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,
+ yyscan_t yyscanner );
void cmExpr_yypop_buffer_state (yyscan_t yyscanner );
-YY_BUFFER_STATE cmExpr_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
-YY_BUFFER_STATE cmExpr_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE cmExpr_yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
+YY_BUFFER_STATE cmExpr_yy_scan_buffer (char *base,yy_size_t size ,
+ yyscan_t yyscanner );
+YY_BUFFER_STATE cmExpr_yy_scan_string (yyconst char *yy_str ,
+ yyscan_t yyscanner );
+YY_BUFFER_STATE cmExpr_yy_scan_bytes (yyconst char *bytes,int len ,
+ yyscan_t yyscanner );
void *cmExpr_yyalloc (yy_size_t ,yyscan_t yyscanner );
void *cmExpr_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
diff --git a/Source/cmExprParserTokens.h b/Source/cmExprParserTokens.h
index f76e537..0309c09 100644
--- a/Source/cmExprParserTokens.h
+++ b/Source/cmExprParserTokens.h
@@ -1,7 +1,7 @@
/* A Bison parser, made by GNU Bison 1.875d. */
-/* Skeleton parser for Yacc-like parsing with Bison,
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Skeleton parser for Yacc-like parsing with Bison, Copyright (C) 1984,
+ 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Source/cmFLTKWrapUICommand.h b/Source/cmFLTKWrapUICommand.h
index 1cd47ce..eb28ace 100644
--- a/Source/cmFLTKWrapUICommand.h
+++ b/Source/cmFLTKWrapUICommand.h
@@ -22,7 +22,8 @@
/** \class cmFLTKWrapUICommand
* \brief Create .h and .cxx files rules for FLTK user interfaces files
*
- * cmFLTKWrapUICommand is used to create wrappers for FLTK classes into normal C++
+ * cmFLTKWrapUICommand is used to create wrappers for FLTK classes into
+ * normal C++
*/
class cmFLTKWrapUICommand : public cmCommand
{
diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h
index fd61694..f3ca020 100644
--- a/Source/cmFileCommand.h
+++ b/Source/cmFileCommand.h
@@ -97,7 +97,8 @@ public:
"Examples of recursive globbing include:\n"
" /dir/*.py - match all python files in /dir and subdirectories\n"
"MAKE_DIRECTORY will create a directory at the specified location\n"
- "RELATIVE_PATH will determine relative path from directory to the given file";
+ "RELATIVE_PATH will determine relative path from directory to the given"
+ " file";
}
cmTypeMacro(cmFileCommand, cmCommand);
diff --git a/Source/cmFindBase.h b/Source/cmFindBase.h
index 31742dd..1051159 100644
--- a/Source/cmFindBase.h
+++ b/Source/cmFindBase.h
@@ -59,8 +59,9 @@ protected:
std::vector<std::string> Names;
std::vector<std::string> SearchPaths;
std::vector<std::string> SearchPathSuffixes;
-
- cmStdString CMakePathName; // CMAKE_*_PATH CMAKE_SYSTEM_*_PATH FRAMEWORK|LIBRARY|INCLUDE|PROGRAM
+
+ // CMAKE_*_PATH CMAKE_SYSTEM_*_PATH FRAMEWORK|LIBRARY|INCLUDE|PROGRAM
+ cmStdString CMakePathName;
cmStdString EnvironmentPath; // LIB,INCLUDE
bool AlreadyInCache;
diff --git a/Source/cmGlobalBorlandMakefileGenerator.h b/Source/cmGlobalBorlandMakefileGenerator.h
index 08928c0..a6ec084 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.h
+++ b/Source/cmGlobalBorlandMakefileGenerator.h
@@ -28,7 +28,8 @@ class cmGlobalBorlandMakefileGenerator : public cmGlobalNMakeMakefileGenerator
{
public:
cmGlobalBorlandMakefileGenerator();
- static cmGlobalGenerator* New() { return new cmGlobalBorlandMakefileGenerator; }
+ static cmGlobalGenerator* New()
+ { return new cmGlobalBorlandMakefileGenerator; }
///! Get the name for the generator.
virtual const char* GetName() const {
@@ -45,7 +46,8 @@ public:
* Try to determine system infomation such as shared library
* extension, pthreads, byte order etc.
*/
- virtual void EnableLanguage(std::vector<std::string>const& languages, cmMakefile *);
+ virtual void EnableLanguage(std::vector<std::string>const& languages,
+ cmMakefile *);
};
#endif
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 6791d93..446899c 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -73,7 +73,8 @@ public:
* Try to determine system infomation such as shared library
* extension, pthreads, byte order etc.
*/
- virtual void EnableLanguage(std::vector<std::string>const& languages, cmMakefile *);
+ virtual void EnableLanguage(std::vector<std::string>const& languages,
+ cmMakefile *);
/**
* Try to determine system infomation, get it from another generator
@@ -101,7 +102,8 @@ public:
const char *makeProgram, const char *config,
bool clean);
virtual std::string GenerateBuildCommand(const char* makeProgram,
- const char *projectName, const char* additionalOptions, const char *targetName,
+ const char *projectName, const char* additionalOptions,
+ const char *targetName,
const char* config, bool ignoreErrors);
///! Set the CMake instance
@@ -114,7 +116,8 @@ public:
void SetConfiguredFilesPath(const char* s){m_ConfiguredFilesPath = s;}
cmLocalGenerator* GetLocalGenerator(int p) { return m_LocalGenerators[p];}
- void GetLocalGenerators(std::vector<cmLocalGenerator *>&g) { g = m_LocalGenerators;}
+ void GetLocalGenerators(std::vector<cmLocalGenerator *>&g)
+ { g = m_LocalGenerators;}
void AddLocalGenerator(cmLocalGenerator *lg);
static int s_TryCompileTimeout;
@@ -164,7 +167,8 @@ public:
std::string& dir);
protected:
- // Fill the m_ProjectMap, this must be called after m_LocalGenerators has been populated.
+ // Fill the m_ProjectMap, this must be called after m_LocalGenerators
+ // has been populated.
void FillProjectMap();
bool IsExcluded(cmLocalGenerator* root, cmLocalGenerator* gen);
diff --git a/Source/cmGlobalMSYSMakefileGenerator.h b/Source/cmGlobalMSYSMakefileGenerator.h
index ba56d84..80986b1 100644
--- a/Source/cmGlobalMSYSMakefileGenerator.h
+++ b/Source/cmGlobalMSYSMakefileGenerator.h
@@ -44,7 +44,8 @@ public:
* Try to determine system infomation such as shared library
* extension, pthreads, byte order etc.
*/
- virtual void EnableLanguage(std::vector<std::string>const& languages, cmMakefile *);
+ virtual void EnableLanguage(std::vector<std::string>const& languages,
+ cmMakefile *);
private:
std::string FindMinGW(std::string const& makeloc);
diff --git a/Source/cmGlobalMinGWMakefileGenerator.h b/Source/cmGlobalMinGWMakefileGenerator.h
index 79a7a25..5067c1a 100644
--- a/Source/cmGlobalMinGWMakefileGenerator.h
+++ b/Source/cmGlobalMinGWMakefileGenerator.h
@@ -44,7 +44,8 @@ public:
* Try to determine system infomation such as shared library
* extension, pthreads, byte order etc.
*/
- virtual void EnableLanguage(std::vector<std::string>const& languages, cmMakefile *);
+ virtual void EnableLanguage(std::vector<std::string>const& languages,
+ cmMakefile *);
};
#endif
diff --git a/Source/cmGlobalNMakeMakefileGenerator.h b/Source/cmGlobalNMakeMakefileGenerator.h
index 71dc6a3..575b587 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.h
+++ b/Source/cmGlobalNMakeMakefileGenerator.h
@@ -44,7 +44,8 @@ public:
* Try to determine system infomation such as shared library
* extension, pthreads, byte order etc.
*/
- virtual void EnableLanguage(std::vector<std::string>const& languages, cmMakefile *);
+ virtual void EnableLanguage(std::vector<std::string>const& languages,
+ cmMakefile *);
};
#endif
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 33083ec..b842171 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -75,7 +75,8 @@ public:
* Try to determine system infomation such as shared library
* extension, pthreads, byte order etc.
*/
- virtual void EnableLanguage(std::vector<std::string>const& languages, cmMakefile *);
+ virtual void EnableLanguage(std::vector<std::string>const& languages,
+ cmMakefile *);
/**
* Generate the all required files for building this project/tree. This
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index cbf6e3b..fa76d68 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -55,8 +55,11 @@ public:
* loaded commands, not as part of the usual build process.
*/
virtual std::string GenerateBuildCommand(const char* makeProgram,
- const char *projectName, const char* additionalOptions, const char *targetName, const char* config,
- bool ignoreErrors);
+ const char *projectName,
+ const char* additionalOptions,
+ const char *targetName,
+ const char* config,
+ bool ignoreErrors);
/**
* Generate the all required files for building this project/tree. This
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index fb52fa7..e647ecd 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -29,7 +29,8 @@ class cmGlobalVisualStudio71Generator : public cmGlobalVisualStudio7Generator
{
public:
cmGlobalVisualStudio71Generator();
- static cmGlobalGenerator* New() { return new cmGlobalVisualStudio71Generator; }
+ static cmGlobalGenerator* New()
+ { return new cmGlobalVisualStudio71Generator; }
///! Get the name for the generator.
virtual const char* GetName() const {
@@ -51,8 +52,10 @@ protected:
const char* name, const char* path, cmTarget &t);
virtual void WriteProjectDepends(std::ostream& fout,
const char* name, const char* path, cmTarget &t);
- virtual void WriteProjectConfigurations(std::ostream& fout, const char* name, bool in_all);
- virtual void WriteExternalProject(std::ostream& fout, const char* name, const char* path,
+ virtual void WriteProjectConfigurations(std::ostream& fout, const char* name,
+ bool in_all);
+ virtual void WriteExternalProject(std::ostream& fout, const char* name,
+ const char* path,
const std::vector<std::string>& depends);
virtual void WriteSLNFooter(std::ostream& fout);
virtual void WriteSLNHeader(std::ostream& fout);
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index 946cfd8..88b603a 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -47,15 +47,19 @@ public:
* Try to determine system infomation such as shared library
* extension, pthreads, byte order etc.
*/
- virtual void EnableLanguage(std::vector<std::string>const& languages, cmMakefile *);
+ virtual void EnableLanguage(std::vector<std::string>const& languages,
+ cmMakefile *);
/**
* Try running cmake and building a file. This is used for dynalically
* loaded commands, not as part of the usual build process.
*/
virtual std::string GenerateBuildCommand(const char* makeProgram,
- const char *projectName, const char* additionalOptions, const char *targetName, const char* config,
- bool ignoreErrors);
+ const char *projectName,
+ const char* additionalOptions,
+ const char *targetName,
+ const char* config,
+ bool ignoreErrors);
/**
* Generate the all required files for building this project/tree. This
@@ -99,7 +103,8 @@ protected:
const char* name, const char* path, cmTarget &t);
virtual void WriteProjectDepends(std::ostream& fout,
const char* name, const char* path, cmTarget &t);
- virtual void WriteProjectConfigurations(std::ostream& fout, const char* name, bool in_all);
+ virtual void WriteProjectConfigurations(std::ostream& fout, const char* name,
+ bool in_all);
virtual void WriteSLNFooter(std::ostream& fout);
virtual void WriteSLNHeader(std::ostream& fout);
diff --git a/Source/cmGlobalWatcomWMakeGenerator.h b/Source/cmGlobalWatcomWMakeGenerator.h
index 2a36edc..6806277 100644
--- a/Source/cmGlobalWatcomWMakeGenerator.h
+++ b/Source/cmGlobalWatcomWMakeGenerator.h
@@ -44,7 +44,8 @@ public:
* Try to determine system infomation such as shared library
* extension, pthreads, byte order etc.
*/
- virtual void EnableLanguage(std::vector<std::string>const& languages, cmMakefile *);
+ virtual void EnableLanguage(std::vector<std::string>const& languages,
+ cmMakefile *);
};
#endif
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 7bb7f8d..3b848ca 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -59,8 +59,11 @@ public:
* loaded commands, not as part of the usual build process.
*/
virtual std::string GenerateBuildCommand(const char* makeProgram,
- const char *projectName, const char* additionalOptions, const char *targetName,
- const char* config, bool ignoreErrors);
+ const char *projectName,
+ const char* additionalOptions,
+ const char *targetName,
+ const char* config,
+ bool ignoreErrors);
/**
* Generate the all required files for building this project/tree. This
diff --git a/Source/cmListCommand.h b/Source/cmListCommand.h
index 5df06dd..99d3314 100644
--- a/Source/cmListCommand.h
+++ b/Source/cmListCommand.h
@@ -65,7 +65,8 @@ public:
{
return
" LIST(LENGTH <list> <output variable>)\n"
- " LIST(GET <list> <element index> [<element index> ...] <output variable>)\n"
+ " LIST(GET <list> <element index> [<element index> ...] "
+ "<output variable>)\n"
" LIST(SET <list> <element> [<element> ...])\n"
" LIST(INSERT <list> <element_index> <element> [<element> ...])\n"
" LIST(REMOVE <variable> <value> [<value> ...])\n"
@@ -76,8 +77,8 @@ public:
"GET will return list of elements specified by indices from the list.\n"
"SET will append elements to the list.\n"
"INSERT will insert elements to the list to the specified location.\n"
- "When specifying an index, negative value corresponds to index from the end "
- "of the list.\n"
+ "When specifying an index, negative value corresponds to index from the"
+ " end of the list.\n"
;
}
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 0323913..6f812ab 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -155,7 +155,8 @@ public:
bool /* clear */) {};
/** Called from command-line hook to scan dependencies. */
- virtual bool ScanDependencies(std::vector<std::string> const& /* args */) {return true;};
+ virtual bool ScanDependencies(std::vector<std::string> const& /* args */)
+ {return true;};
/** Compute the list of link libraries and directories for the given
target and configuration. */
@@ -205,7 +206,8 @@ protected:
const char* workingDirectory,
const char* newline = "\n");
- ///! Fill out these strings for the given target. Libraries to link, flags, and linkflags.
+ /** Fill out these strings for the given target. Libraries to link,
+ * flags, and linkflags. */
void GetTargetFlags(std::string& linkLibs,
std::string& flags,
std::string& linkFlags,
@@ -221,7 +223,8 @@ protected:
std::string ExpandRuleVariable(std::string const& variable,
const RuleVariables& replaceValues);
- ///! Convert a target to a utility target for unsupported languages of a generator
+ /** Convert a target to a utility target for unsupported
+ * languages of a generator */
void AddBuildTargetRule(const char* llang, cmTarget& target);
///! add a custom command to build a .o file that is part of a target
void AddCustomCommandToCreateObject(const char* ofname,
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 4864ffb..869ad9f 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -191,7 +191,8 @@ public:
// language has its own list because integrity may be checked
// differently.
struct IntegrityCheckSet: public std::set<cmSourceFile *> {};
- struct IntegrityCheckSetMap: public std::map<cmStdString, IntegrityCheckSet> {};
+ struct IntegrityCheckSetMap: public std::map<cmStdString, IntegrityCheckSet>
+ {};
std::map<cmStdString, IntegrityCheckSetMap> &GetIntegrityCheckSet()
{ return m_CheckDependFiles;}
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx
index 8e71afd..e638d26 100644
--- a/Source/cmSourceFile.cxx
+++ b/Source/cmSourceFile.cxx
@@ -212,7 +212,8 @@ const std::string& cmSourceFile::GetSourceNameWithoutLastExtension()
{
if ( m_SourceNameWithoutLastExtension.empty() )
{
- m_SourceNameWithoutLastExtension = cmSystemTools::GetFilenameWithoutLastExtension(m_FullPath);
+ m_SourceNameWithoutLastExtension =
+ cmSystemTools::GetFilenameWithoutLastExtension(m_FullPath);
}
return m_SourceNameWithoutLastExtension;
}
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index aa24a02..4d42a05 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -226,7 +226,8 @@ bool cmStringCommand::HandleRegexCommand(std::vector<std::string> const& args)
//----------------------------------------------------------------------------
bool cmStringCommand::RegexMatch(std::vector<std::string> const& args)
{
- //"STRING(REGEX MATCH <regular_expression> <output variable> <input> [<input>...])\n";
+ //"STRING(REGEX MATCH <regular_expression> <output variable>
+ // <input> [<input>...])\n";
std::string regex = args[2];
std::string outvar = args[3];
@@ -241,7 +242,8 @@ bool cmStringCommand::RegexMatch(std::vector<std::string> const& args)
cmsys::RegularExpression re;
if(!re.compile(regex.c_str()))
{
- std::string e = "sub-command REGEX, mode MATCH failed to compile regex \""+regex+"\".";
+ std::string e =
+ "sub-command REGEX, mode MATCH failed to compile regex \""+regex+"\".";
this->SetError(e.c_str());
return false;
}
@@ -254,7 +256,9 @@ bool cmStringCommand::RegexMatch(std::vector<std::string> const& args)
std::string::size_type r = re.end();
if(r-l == 0)
{
- std::string e = "sub-command REGEX, mode MATCH regex \""+regex+"\" matched an empty string.";
+ std::string e =
+ "sub-command REGEX, mode MATCH regex \""+regex+
+ "\" matched an empty string.";
this->SetError(e.c_str());
return false;
}
@@ -269,7 +273,8 @@ bool cmStringCommand::RegexMatch(std::vector<std::string> const& args)
//----------------------------------------------------------------------------
bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args)
{
- //"STRING(REGEX MATCHALL <regular_expression> <output variable> <input> [<input>...])\n";
+ //"STRING(REGEX MATCHALL <regular_expression> <output variable> <input>
+ // [<input>...])\n";
std::string regex = args[2];
std::string outvar = args[3];
@@ -284,7 +289,9 @@ bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args)
cmsys::RegularExpression re;
if(!re.compile(regex.c_str()))
{
- std::string e = "sub-command REGEX, mode MATCHALL failed to compile regex \""+regex+"\".";
+ std::string e =
+ "sub-command REGEX, mode MATCHALL failed to compile regex \""+
+ regex+"\".";
this->SetError(e.c_str());
return false;
}
@@ -298,7 +305,8 @@ bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args)
std::string::size_type r = re.end();
if(r-l == 0)
{
- std::string e = "sub-command REGEX, mode MATCHALL regex \""+regex+"\" matched an empty string.";
+ std::string e = "sub-command REGEX, mode MATCHALL regex \""+
+ regex+"\" matched an empty string.";
this->SetError(e.c_str());
return false;
}
@@ -318,7 +326,8 @@ bool cmStringCommand::RegexMatchAll(std::vector<std::string> const& args)
//----------------------------------------------------------------------------
bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
{
- //"STRING(REGEX REPLACE <regular_expression> <replace_expression> <output variable> <input> [<input>...])\n"
+ //"STRING(REGEX REPLACE <regular_expression> <replace_expression>
+ // <output variable> <input> [<input>...])\n"
std::string regex = args[2];
std::string replace = args[3];
std::string outvar = args[4];
@@ -382,7 +391,9 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
cmsys::RegularExpression re;
if(!re.compile(regex.c_str()))
{
- std::string e = "sub-command REGEX, mode REPLACE failed to compile regex \""+regex+"\".";
+ std::string e =
+ "sub-command REGEX, mode REPLACE failed to compile regex \""+
+ regex+"\".";
this->SetError(e.c_str());
return false;
}
@@ -401,7 +412,8 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
// Make sure the match had some text.
if(r-l2 == 0)
{
- std::string e = "sub-command REGEX, mode REPLACE regex \""+regex+"\" matched an empty string.";
+ std::string e = "sub-command REGEX, mode REPLACE regex \""+
+ regex+"\" matched an empty string.";
this->SetError(e.c_str());
return false;
}
@@ -451,7 +463,8 @@ bool cmStringCommand::RegexReplace(std::vector<std::string> const& args)
}
//----------------------------------------------------------------------------
-bool cmStringCommand::HandleCompareCommand(std::vector<std::string> const& args)
+bool cmStringCommand::HandleCompareCommand(std::vector<std::string> const&
+ args)
{
if(args.size() < 2)
{
@@ -507,7 +520,8 @@ bool cmStringCommand::HandleCompareCommand(std::vector<std::string> const& args)
}
//----------------------------------------------------------------------------
-bool cmStringCommand::HandleReplaceCommand(std::vector<std::string> const& args)
+bool cmStringCommand::HandleReplaceCommand(std::vector<std::string> const&
+ args)
{
if(args.size() < 5)
{
@@ -525,14 +539,16 @@ bool cmStringCommand::HandleReplaceCommand(std::vector<std::string> const& args)
input += args[i];
}
- cmsys::SystemTools::ReplaceString(input, matchExpression.c_str(), replaceExpression.c_str());
+ cmsys::SystemTools::ReplaceString(input, matchExpression.c_str(),
+ replaceExpression.c_str());
m_Makefile->AddDefinition(variableName.c_str(), input.c_str());
return true;
}
//----------------------------------------------------------------------------
-bool cmStringCommand::HandleSubstringCommand(std::vector<std::string> const& args)
+bool cmStringCommand::HandleSubstringCommand(std::vector<std::string> const&
+ args)
{
if(args.size() != 5)
{
@@ -550,7 +566,8 @@ bool cmStringCommand::HandleSubstringCommand(std::vector<std::string> const& arg
if ( begin < 0 || begin > intStringLength )
{
cmOStringStream ostr;
- ostr << "begin index: " << begin << " is out of range 0 - " << stringLength;
+ ostr << "begin index: " << begin << " is out of range 0 - "
+ << stringLength;
this->SetError(ostr.str().c_str());
return false;
}
@@ -558,12 +575,14 @@ bool cmStringCommand::HandleSubstringCommand(std::vector<std::string> const& arg
if ( end < 0 || end > leftOverLength )
{
cmOStringStream ostr;
- ostr << "end index: " << end << " is out of range " << 0 << " - " << leftOverLength;
+ ostr << "end index: " << end << " is out of range " << 0 << " - "
+ << leftOverLength;
this->SetError(ostr.str().c_str());
return false;
}
- m_Makefile->AddDefinition(variableName.c_str(), stringValue.substr(begin, end).c_str());
+ m_Makefile->AddDefinition(variableName.c_str(),
+ stringValue.substr(begin, end).c_str());
return true;
}
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 3da646e..6199cf7 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -290,7 +290,8 @@ void cmSystemTools::Message(const char* m1, const char *title)
}
if(s_ErrorCallback)
{
- (*s_ErrorCallback)(m1, title, s_DisableMessages, s_ErrorCallbackClientData);
+ (*s_ErrorCallback)(m1, title, s_DisableMessages,
+ s_ErrorCallbackClientData);
return;
}
else
@@ -368,8 +369,10 @@ std::vector<cmStdString> cmSystemTools::ParseArguments(const char* command)
bool win_path = false;
if ( command[0] != '/' && command[1] == ':' && command[2] == '\\' ||
- command[0] == '\"' && command[1] != '/' && command[2] == ':' && command[3] == '\\' ||
- command[0] == '\'' && command[1] != '/' && command[2] == ':' && command[3] == '\\' ||
+ command[0] == '\"' && command[1] != '/' && command[2] == ':'
+ && command[3] == '\\' ||
+ command[0] == '\'' && command[1] != '/' && command[2] == ':'
+ && command[3] == '\\' ||
command[0] == '\\' && command[1] == '\\')
{
win_path = true;
@@ -599,10 +602,12 @@ bool RunCommandViaWin32(const char* command,
int timeout)
{
#if defined(__BORLANDC__)
- return cmWin32ProcessExecution::BorlandRunCommand(command, dir, output,
- retVal,
- verbose, timeout,
- cmSystemTools::GetRunCommandHideConsole());
+ return
+ cmWin32ProcessExecution::
+ BorlandRunCommand(command, dir, output,
+ retVal,
+ verbose, timeout,
+ cmSystemTools::GetRunCommandHideConsole());
#else // Visual studio
::SetLastError(ERROR_SUCCESS);
if ( ! command )
@@ -1137,7 +1142,8 @@ cmSystemTools::FileFormat cmSystemTools::GetFileFormat(const char* cext)
ext == "for" || ext == ".for" ||
ext == "f95" || ext == ".f95"
) { return cmSystemTools::FORTRAN_FILE_FORMAT; }
- if ( ext == "java" || ext == ".java" ) { return cmSystemTools::JAVA_FILE_FORMAT; }
+ if ( ext == "java" || ext == ".java" )
+ { return cmSystemTools::JAVA_FILE_FORMAT; }
if (
ext == "H" || ext == ".H" ||
ext == "h" || ext == ".h" ||
@@ -1148,12 +1154,16 @@ cmSystemTools::FileFormat cmSystemTools::GetFileFormat(const char* cext)
ext == "in" || ext == ".in" ||
ext == "txx" || ext == ".txx"
) { return cmSystemTools::HEADER_FILE_FORMAT; }
- if ( ext == "rc" || ext == ".rc" ) { return cmSystemTools::RESOURCE_FILE_FORMAT; }
- if ( ext == "def" || ext == ".def" ) { return cmSystemTools::DEFINITION_FILE_FORMAT; }
+ if ( ext == "rc" || ext == ".rc" )
+ { return cmSystemTools::RESOURCE_FILE_FORMAT; }
+ if ( ext == "def" || ext == ".def" )
+ { return cmSystemTools::DEFINITION_FILE_FORMAT; }
if ( ext == "lib" || ext == ".lib" ||
- ext == "a" || ext == ".a") { return cmSystemTools::STATIC_LIBRARY_FILE_FORMAT; }
+ ext == "a" || ext == ".a")
+ { return cmSystemTools::STATIC_LIBRARY_FILE_FORMAT; }
if ( ext == "o" || ext == ".o" ||
- ext == "obj" || ext == ".obj") { return cmSystemTools::OBJECT_FILE_FORMAT; }
+ ext == "obj" || ext == ".obj")
+ { return cmSystemTools::OBJECT_FILE_FORMAT; }
#ifdef __APPLE__
if ( ext == "dylib" || ext == ".dylib" )
{ return cmSystemTools::SHARED_LIBRARY_FILE_FORMAT; }
@@ -1231,11 +1241,13 @@ std::string cmSystemTools::RelativePath(const char* local, const char* remote)
{
if(!cmSystemTools::FileIsFullPath(local))
{
- cmSystemTools::Error("RelativePath must be passed a full path to local: ", local);
+ cmSystemTools::Error("RelativePath must be passed a full path to local: ",
+ local);
}
if(!cmSystemTools::FileIsFullPath(remote))
{
- cmSystemTools::Error("RelativePath must be passed a full path to remote: ", remote);
+ cmSystemTools::Error("RelativePath must be passed a full path to remote: ",
+ remote);
}
return cmsys::SystemTools::RelativePath(local, remote);
}
@@ -1288,7 +1300,8 @@ std::string cmSystemTools::MakeXMLSafe(const char* str)
for ( ;*pos; ++pos)
{
char ch = *pos;
- if ( (ch > 126 || ch < 32) && ch != 9 && ch != 10 && ch != 13 && ch != '\r' )
+ if ( (ch > 126 || ch < 32) && ch != 9 && ch != 10 && ch != 13
+ && ch != '\r' )
{
char buffer[33];
sprintf(buffer, "&lt;%d&gt;", (int)ch);
@@ -1349,13 +1362,16 @@ struct cmSystemToolsGZStruct
};
extern "C" {
- int cmSystemToolsGZStructOpen(void* call_data, const char *pathname, int oflags, mode_t mode);
+ int cmSystemToolsGZStructOpen(void* call_data, const char *pathname,
+ int oflags, mode_t mode);
int cmSystemToolsGZStructClose(void* call_data);
ssize_t cmSystemToolsGZStructRead(void* call_data, void* buf, size_t count);
- ssize_t cmSystemToolsGZStructWrite(void* call_data, const void* buf, size_t count);
+ ssize_t cmSystemToolsGZStructWrite(void* call_data, const void* buf,
+ size_t count);
}
-int cmSystemToolsGZStructOpen(void* call_data, const char *pathname, int oflags, mode_t mode)
+int cmSystemToolsGZStructOpen(void* call_data, const char *pathname,
+ int oflags, mode_t mode)
{
const char *gzoflags;
int fd;
@@ -1411,7 +1427,8 @@ ssize_t cmSystemToolsGZStructRead(void* call_data, void* buf, size_t count)
return cm_zlib_gzread(gzf->GZFile, buf, count);
}
-ssize_t cmSystemToolsGZStructWrite(void* call_data, const void* buf, size_t count)
+ssize_t cmSystemToolsGZStructWrite(void* call_data, const void* buf,
+ size_t count)
{
cmSystemToolsGZStruct* gzf = static_cast<cmSystemToolsGZStruct*>(call_data);
return cm_zlib_gzwrite(gzf->GZFile, (void*)buf, count);
@@ -1419,7 +1436,9 @@ ssize_t cmSystemToolsGZStructWrite(void* call_data, const void* buf, size_t coun
#endif
-bool cmSystemTools::CreateTar(const char* outFileName, const std::vector<cmStdString>& files, bool gzip, bool verbose)
+bool cmSystemTools::CreateTar(const char* outFileName,
+ const std::vector<cmStdString>& files,
+ bool gzip, bool verbose)
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
TAR *t;
@@ -1459,7 +1478,8 @@ bool cmSystemTools::CreateTar(const char* outFileName, const std::vector<cmStdSt
if (tar_append_tree(t, buf, pathname) != 0)
{
cmOStringStream ostr;
- ostr << "Problem with tar_append_tree(\"" << buf << "\", \"" << pathname << "\"): "
+ ostr << "Problem with tar_append_tree(\"" << buf << "\", \""
+ << pathname << "\"): "
<< strerror(errno);
cmSystemTools::Error(ostr.str().c_str());
tar_close(t);
@@ -1485,7 +1505,9 @@ bool cmSystemTools::CreateTar(const char* outFileName, const std::vector<cmStdSt
#endif
}
-bool cmSystemTools::ExtractTar(const char* outFileName, const std::vector<cmStdString>& files, bool gzip, bool verbose)
+bool cmSystemTools::ExtractTar(const char* outFileName,
+ const std::vector<cmStdString>& files,
+ bool gzip, bool verbose)
{
(void)files;
#if defined(CMAKE_BUILD_WITH_CMAKE)
@@ -1535,7 +1557,9 @@ bool cmSystemTools::ExtractTar(const char* outFileName, const std::vector<cmStdS
#endif
}
-bool cmSystemTools::ListTar(const char* outFileName, std::vector<cmStdString>& files, bool gzip, bool verbose)
+bool cmSystemTools::ListTar(const char* outFileName,
+ std::vector<cmStdString>& files, bool gzip,
+ bool verbose)
{
#if defined(CMAKE_BUILD_WITH_CMAKE)
TAR *t;
@@ -1586,7 +1610,8 @@ bool cmSystemTools::ListTar(const char* outFileName, std::vector<cmStdString>& f
#endif
if (TH_ISREG(t) && tar_skip_regfile(t) != 0)
{
- cmSystemTools::Error("Problem with tar_skip_regfile(): ", strerror(errno));
+ cmSystemTools::Error("Problem with tar_skip_regfile(): ",
+ strerror(errno));
return false;
}
}
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 39cdbae..f47122f 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -131,8 +131,10 @@ void cmTarget::TraceVSDependencies(std::string projFile,
makefile->GetSourceFileWithOutput(id->c_str());
// if a source file was found then add it
if (outsf &&
- (std::find(classes.begin(),classes.end(),outsf) == classes.end()) &&
- (std::find(newClasses.begin(),newClasses.end(),outsf) == newClasses.end()))
+ (std::find(classes.begin(),classes.end(),outsf) == classes.end())
+ &&
+ (std::find(newClasses.begin(),newClasses.end(),outsf)
+ == newClasses.end()))
{
// then add the source to this target and add it to the queue
newClasses.push_back(outsf);
@@ -169,7 +171,8 @@ void cmTarget::TraceVSDependencies(std::string projFile,
srcFilesQueued.insert(projFile);
}
// add in the library depends for custom targets
- if (this->GetType() == cmTarget::UTILITY || this->GetType() == cmTarget::GLOBAL_TARGET)
+ if (this->GetType() == cmTarget::UTILITY ||
+ this->GetType() == cmTarget::GLOBAL_TARGET)
{
for (std::vector<cmCustomCommand>::iterator ic =
this->GetPostBuildCommands().begin();
@@ -224,7 +227,8 @@ void cmTarget::TraceVSDependencies(std::string projFile,
dep = cmSystemTools::GetFilenameWithoutLastExtension(dep);
}
// watch for target dependencies,
- if(m_Makefile->GetLocalGenerator()->GetGlobalGenerator()->FindTarget(0, dep.c_str()))
+ if(m_Makefile->GetLocalGenerator()->
+ GetGlobalGenerator()->FindTarget(0, dep.c_str()))
{
// add the depend as a utility on the target
this->AddUtility(dep.c_str());
@@ -342,7 +346,8 @@ const std::vector<std::string>& cmTarget::GetLinkDirectories()
if(!m_LinkLibrariesAnalyzed && !m_LinkLibraries.empty())
{
cmSystemTools::Error(
- "cmTarget::GetLinkDirectories called before cmTarget::AnalyzeLibDependencies on target ",
+ "cmTarget::GetLinkDirectories called before "
+ "cmTarget::AnalyzeLibDependencies on target ",
m_Name.c_str());
}
@@ -420,7 +425,8 @@ void cmTarget::AddLinkLibrary(const std::string& lib,
LinkLibraryType llt)
{
this->AddFramework(lib.c_str(), llt);
- m_LinkLibraries.push_back( std::pair<std::string, cmTarget::LinkLibraryType>(lib,llt) );
+ m_LinkLibraries.push_back( std::pair<std::string,
+ cmTarget::LinkLibraryType>(lib,llt) );
}
bool cmTarget::AddFramework(const std::string& libname, LinkLibraryType llt)
@@ -452,7 +458,8 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
return;
}
this->AddFramework(lib, llt);
- m_LinkLibraries.push_back( std::pair<std::string, cmTarget::LinkLibraryType>(lib,llt) );
+ m_LinkLibraries.push_back( std::pair<std::string,
+ cmTarget::LinkLibraryType>(lib,llt) );
if(llt != cmTarget::GENERAL)
{
@@ -470,13 +477,16 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
if(!def || strcmp(def, "debug") == 0)
{
mf.AddCacheDefinition(linkTypeName.c_str(),
- "debug", "Library is used for debug links only",
+ "debug",
+ "Library is used for debug links only",
cmCacheManager::STATIC);
}
else
{
mf.AddCacheDefinition(linkTypeName.c_str(),
- "general", "Library is used for both debug and optimized links",
+ "general",
+ "Library is used for both debug "
+ "and optimized links",
cmCacheManager::STATIC);
}
}
@@ -487,13 +497,15 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
if(!def || strcmp(def, "optimized") == 0)
{
mf.AddCacheDefinition(linkTypeName.c_str(),
- "optimized", "Library is used for debug links only",
+ "optimized", "Library is used for debug "
+ "links only",
cmCacheManager::STATIC);
}
else
{
mf.AddCacheDefinition(linkTypeName.c_str(),
- "general", "Library is used for both debug and optimized links",
+ "general", "Library is used for both debug "
+ "and optimized links",
cmCacheManager::STATIC);
}
}
@@ -651,7 +663,8 @@ cmTarget::AnalyzeLibDependencies( const cmMakefile& mf )
// 4. Add the new libraries to the link line.
//
- for( std::vector<std::string>::reverse_iterator k = newLinkLibraries.rbegin();
+ for( std::vector<std::string>::reverse_iterator k =
+ newLinkLibraries.rbegin();
k != newLinkLibraries.rend(); ++k )
{
std::string linkType = *k;
@@ -694,7 +707,8 @@ void cmTarget::DeleteDependency( DependencyMap& depMap,
{
DependencyList& depList = map_itr->second;
DependencyList::iterator itr;
- while( (itr = std::find(depList.begin(), depList.end(), dep)) != depList.end() )
+ while( (itr = std::find(depList.begin(), depList.end(), dep)) !=
+ depList.end() )
{
depList.erase( itr );
}
@@ -958,7 +972,8 @@ const char* cmTarget::GetLinkerLanguage(cmGlobalGenerator* gg)
}
if(languages.size() == 1)
{
- const_cast<cmTarget*>(this)->SetProperty("LINKER_LANGUAGE", languages.begin()->c_str());
+ const_cast<cmTarget*>(this)->SetProperty("LINKER_LANGUAGE",
+ languages.begin()->c_str());
return this->GetProperty("LINKER_LANGUAGE");
}
const char* prefLang = 0;
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 9b35c95..71d649f 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -17,7 +17,8 @@
#include "cmTargetLinkLibrariesCommand.h"
// cmTargetLinkLibrariesCommand
-bool cmTargetLinkLibrariesCommand::InitialPass(std::vector<std::string> const& args)
+bool cmTargetLinkLibrariesCommand::InitialPass(std::vector<std::string>
+ const& args)
{
// must have one argument
if(args.size() < 1)
@@ -55,7 +56,8 @@ bool cmTargetLinkLibrariesCommand::InitialPass(std::vector<std::string> const& a
++i;
if(i == args.end())
{
- this->SetError("The \"optimized\" argument must be followed by a library");
+ this->SetError(
+ "The \"optimized\" argument must be followed by a library");
return false;
}
m_Makefile->AddLinkLibraryForTarget(args[0].c_str(),i->c_str(),
diff --git a/Source/cmTryCompileCommand.cxx b/Source/cmTryCompileCommand.cxx
index 803b639..bbf74fc 100644
--- a/Source/cmTryCompileCommand.cxx
+++ b/Source/cmTryCompileCommand.cxx
@@ -119,8 +119,9 @@ int cmTryCompileCommand::CoreTryCompileCode(
// do not allow recursive try Compiles
if (!strcmp(binaryDirectory,mf->GetHomeOutputDirectory()))
{
- cmSystemTools::Error("Attempt at a recursive or nested TRY_COMPILE in directory ",
- binaryDirectory);
+ cmSystemTools::Error(
+ "Attempt at a recursive or nested TRY_COMPILE in directory ",
+ binaryDirectory);
return -1;
}
@@ -201,7 +202,8 @@ int cmTryCompileCommand::CoreTryCompileCode(
}
fprintf(fout, "ADD_EXECUTABLE(cmTryCompileExec \"%s\")\n",source.c_str());
- fprintf(fout, "TARGET_LINK_LIBRARIES(cmTryCompileExec ${LINK_LIBRARIES})\n");
+ fprintf(fout,
+ "TARGET_LINK_LIBRARIES(cmTryCompileExec ${LINK_LIBRARIES})\n");
fclose(fout);
projectName = "CMAKE_TRY_COMPILE";
targetName = "cmTryCompileExec";
@@ -279,7 +281,9 @@ void cmTryCompileCommand::CleanupFiles(const char* binDir)
std::string bdir = binDir;
if(bdir.find("CMakeTmp") == std::string::npos)
{
- cmSystemTools::Error("TRY_COMPILE attempt to remove -rf directory that does not contain CMakeTmp:", binDir);
+ cmSystemTools::Error(
+ "TRY_COMPILE attempt to remove -rf directory that does not contain "
+ "CMakeTmp:", binDir);
return;
}
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index f8525a3..a0f28aa 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -56,7 +56,7 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv)
if ( argv.size() <= (i+1) )
{
cmSystemTools::Error(
- "OUTPUT_VARIABLE specified but there is no variable");
+ "OUTPUT_VARIABLE specified but there is no variable");
return false;
}
outputVariable = argv[i+1];
@@ -64,7 +64,8 @@ bool cmTryRunCommand::InitialPass(std::vector<std::string> const& argv)
}
}
// do the try compile
- int res = cmTryCompileCommand::CoreTryCompileCode(m_Makefile, tryCompile, false);
+ int res = cmTryCompileCommand::CoreTryCompileCode(m_Makefile, tryCompile,
+ false);
// now try running the command if it compiled
std::string binaryDirectory = argv[2] + "/CMakeFiles/CMakeTmp";
diff --git a/Source/cmUseMangledMesaCommand.cxx b/Source/cmUseMangledMesaCommand.cxx
index 789ff0f..8699188 100644
--- a/Source/cmUseMangledMesaCommand.cxx
+++ b/Source/cmUseMangledMesaCommand.cxx
@@ -94,7 +94,8 @@ CopyAndFullPathMesaHeader(const char* source,
// input file at the same time
std::string inLine;
// regular expression for any #include line
- cmsys::RegularExpression includeLine("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
+ cmsys::RegularExpression includeLine(
+ "^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
// regular expression for gl/ or GL/ in a file (match(1) of above)
cmsys::RegularExpression glDirLine("(gl|GL)(/|\\\\)([^<\"]+)");
// regular expression for gl GL or xmesa in a file (match(1) of above)
@@ -111,7 +112,8 @@ CopyAndFullPathMesaHeader(const char* source,
}
else if(glLine.find(includeFile.c_str()))
{
- fout << "#include \"" << outdir << "/" << includeLine.match(1).c_str() << "\"\n";
+ fout << "#include \"" << outdir << "/" <<
+ includeLine.match(1).c_str() << "\"\n";
}
else
{
diff --git a/Source/cmUtilitySourceCommand.cxx b/Source/cmUtilitySourceCommand.cxx
index 425637f..a5f7f53 100644
--- a/Source/cmUtilitySourceCommand.cxx
+++ b/Source/cmUtilitySourceCommand.cxx
@@ -67,7 +67,8 @@ bool cmUtilitySourceCommand::InitialPass(std::vector<std::string> const& args)
}
// The source exists.
- std::string cmakeCFGout = m_Makefile->GetRequiredDefinition("CMAKE_CFG_INTDIR");
+ std::string cmakeCFGout =
+ m_Makefile->GetRequiredDefinition("CMAKE_CFG_INTDIR");
std::string utilityDirectory = m_Makefile->GetCurrentOutputDirectory();
std::string exePath;
if (m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"))
diff --git a/Source/cmVTKMakeInstantiatorCommand.cxx b/Source/cmVTKMakeInstantiatorCommand.cxx
index 5d96b80..4b7955e 100644
--- a/Source/cmVTKMakeInstantiatorCommand.cxx
+++ b/Source/cmVTKMakeInstantiatorCommand.cxx
@@ -275,7 +275,8 @@ cmVTKMakeInstantiatorCommand
// Write the extern declarations for all the creation functions.
for(unsigned int i=0;i < m_Classes.size();++i)
{
- os << "extern vtkObject* vtkInstantiator" << m_Classes[i].c_str() << "New();\n";
+ os << "extern vtkObject* vtkInstantiator" << m_Classes[i].c_str()
+ << "New();\n";
}
// Write the ClassInitialize method to register all the creation functions.
@@ -405,7 +406,8 @@ cmVTKMakeInstantiatorCommand
os <<
"};\n"
"\n"
- "class " << m_ExportMacro.c_str() << " " << m_ClassName.c_str() << "Initialize\n"
+ "class " << m_ExportMacro.c_str() << " " << m_ClassName.c_str()
+ << "Initialize\n"
"{\n"
"public:\n"
" " << m_ClassName.c_str() << "Initialize();\n"
@@ -414,7 +416,8 @@ cmVTKMakeInstantiatorCommand
" static unsigned int Count;\n"
"};\n"
"\n"
- "static " << m_ClassName.c_str() << "Initialize " << m_ClassName.c_str() << "Initializer;\n"
+ "static " << m_ClassName.c_str() << "Initialize " << m_ClassName.c_str()
+ << "Initializer;\n"
"\n"
"#endif\n";
}
@@ -460,13 +463,15 @@ cmVTKMakeInstantiatorCommand
os <<
"}\n"
"\n" <<
- m_ClassName.c_str() << "Initialize::" << m_ClassName.c_str() << "Initialize()\n"
+ m_ClassName.c_str() << "Initialize::" << m_ClassName.c_str()
+ << "Initialize()\n"
"{\n"
" if(++" << m_ClassName.c_str() << "Initialize::Count == 1)\n"
" { " << m_ClassName.c_str() << "::ClassInitialize(); }\n"
"}\n"
"\n" <<
- m_ClassName.c_str() << "Initialize::~" << m_ClassName.c_str() << "Initialize()\n"
+ m_ClassName.c_str() << "Initialize::~" << m_ClassName.c_str()
+ << "Initialize()\n"
"{\n"
" if(--" << m_ClassName.c_str() << "Initialize::Count == 0)\n"
" { " << m_ClassName.c_str() << "::ClassFinalize(); }\n"
diff --git a/Source/cmVTKWrapJavaCommand.cxx b/Source/cmVTKWrapJavaCommand.cxx
index 0cb139f..f20bbc3 100644
--- a/Source/cmVTKWrapJavaCommand.cxx
+++ b/Source/cmVTKWrapJavaCommand.cxx
@@ -49,7 +49,8 @@ bool cmVTKWrapJavaCommand::InitialPass(std::vector<std::string> const& argsIn)
}
// Prepare java dependency file
- const char* resultDirectory = m_Makefile->GetRequiredDefinition("VTK_JAVA_HOME");
+ const char* resultDirectory =
+ m_Makefile->GetRequiredDefinition("VTK_JAVA_HOME");
std::string res = m_Makefile->GetCurrentOutputDirectory();
std::string depFileName = res + "/JavaDependencies.cmake";
std::ofstream depFile(depFileName.c_str());
@@ -113,7 +114,8 @@ void cmVTKWrapJavaCommand::FinalPass()
const char* wjava = m_Makefile->GetRequiredDefinition("VTK_WRAP_JAVA_EXE");
const char* pjava = m_Makefile->GetRequiredDefinition("VTK_PARSE_JAVA_EXE");
const char* hints = m_Makefile->GetDefinition("VTK_WRAP_HINTS");
- const char* resultDirectory = m_Makefile->GetRequiredDefinition("VTK_JAVA_HOME");
+ const char* resultDirectory =
+ m_Makefile->GetRequiredDefinition("VTK_JAVA_HOME");
// wrap all the .h files
depends.push_back(wjava);
@@ -143,7 +145,8 @@ void cmVTKWrapJavaCommand::FinalPass()
{
commandLineW.push_back(hints);
}
- commandLineW.push_back((m_WrapClasses[classNum].GetPropertyAsBool("ABSTRACT") ? "0" : "1"));
+ commandLineW.push_back(
+ (m_WrapClasses[classNum].GetPropertyAsBool("ABSTRACT") ? "0" : "1"));
commandLineW.push_back(res);
cmCustomCommandLines commandLines;
@@ -165,7 +168,8 @@ void cmVTKWrapJavaCommand::FinalPass()
{
commandLineP.push_back(hints);
}
- commandLineP.push_back((m_WrapClasses[classNum].GetPropertyAsBool("ABSTRACT") ? "0" : "1"));
+ commandLineP.push_back(
+ (m_WrapClasses[classNum].GetPropertyAsBool("ABSTRACT") ? "0" : "1"));
commandLineP.push_back(res2);
cmCustomCommandLines commandLines2;
diff --git a/Source/cmVTKWrapPythonCommand.cxx b/Source/cmVTKWrapPythonCommand.cxx
index b9aa32d..23b37ec 100644
--- a/Source/cmVTKWrapPythonCommand.cxx
+++ b/Source/cmVTKWrapPythonCommand.cxx
@@ -17,7 +17,8 @@
#include "cmVTKWrapPythonCommand.h"
// cmVTKWrapPythonCommand
-bool cmVTKWrapPythonCommand::InitialPass(std::vector<std::string> const& argsIn)
+bool cmVTKWrapPythonCommand::InitialPass(std::vector<std::string> const&
+ argsIn)
{
if(argsIn.size() < 3 )
{
@@ -102,7 +103,8 @@ void cmVTKWrapPythonCommand::FinalPass()
// first we add the rules for all the .h to Python.cxx files
size_t lastClass = m_WrapClasses.size();
std::vector<std::string> depends;
- const char* wpython = m_Makefile->GetRequiredDefinition("VTK_WRAP_PYTHON_EXE");
+ const char* wpython = m_Makefile->
+ GetRequiredDefinition("VTK_WRAP_PYTHON_EXE");
const char* hints = m_Makefile->GetDefinition("VTK_WRAP_HINTS");
// wrap all the .h files
@@ -124,7 +126,8 @@ void cmVTKWrapPythonCommand::FinalPass()
{
commandLine.push_back(hints);
}
- commandLine.push_back((m_WrapClasses[classNum].GetPropertyAsBool("ABSTRACT") ? "0" : "1"));
+ commandLine.push_back(
+ (m_WrapClasses[classNum].GetPropertyAsBool("ABSTRACT") ? "0" : "1"));
commandLine.push_back(res);
cmCustomCommandLines commandLines;
@@ -193,9 +196,11 @@ bool cmVTKWrapPythonCommand::WriteInit(const char *kitName,
for (i = 0; i < classes.size(); i++)
{
#ifdef _WIN32
- fprintf(fout,"extern \"C\" {__declspec( dllexport) PyObject *PyVTKClass_%sNew(char *); }\n",classes[i].c_str());
+ fprintf(fout,
+ "extern \"C\" {__declspec( dllexport) PyObject *PyVTKClass_%sNew(char *); }\n",classes[i].c_str());
#else
- fprintf(fout,"extern \"C\" {PyObject *PyVTKClass_%sNew(char *); }\n",classes[i].c_str());
+ fprintf(fout,"extern \"C\" {PyObject *PyVTKClass_%sNew(char *); }\n",
+ classes[i].c_str());
#endif
}
@@ -204,7 +209,8 @@ bool cmVTKWrapPythonCommand::WriteInit(const char *kitName,
fprintf(fout,"{NULL, NULL, 0, NULL}};\n\n");
#ifdef _WIN32
- fprintf(fout,"extern \"C\" {__declspec( dllexport) void init%s();}\n\n",kitName);
+ fprintf(fout,"extern \"C\" {__declspec( dllexport) void init%s();}\n\n",
+ kitName);
fprintf(fout,"void init%s()\n{\n",kitName);
#else
fprintf(fout,"extern \"C\" {void initlib%s();}\n\n",kitName);
diff --git a/Source/cmVTKWrapTclCommand.cxx b/Source/cmVTKWrapTclCommand.cxx
index 2daad71..a7c1511 100644
--- a/Source/cmVTKWrapTclCommand.cxx
+++ b/Source/cmVTKWrapTclCommand.cxx
@@ -163,7 +163,8 @@ void cmVTKWrapTclCommand::FinalPass()
{
commandLine.push_back(hints);
}
- commandLine.push_back((m_WrapClasses[classNum].GetPropertyAsBool("ABSTRACT") ? "0" : "1"));
+ commandLine.push_back(
+ (m_WrapClasses[classNum].GetPropertyAsBool("ABSTRACT") ? "0" : "1"));
std::string res = m_Makefile->GetCurrentOutputDirectory();
res += "/";
res += m_WrapClasses[classNum].GetSourceName() + ".cxx";
@@ -225,7 +226,8 @@ bool cmVTKWrapTclCommand::WriteInit(const char *kitName,
FILE *fout = fopen(tempOutputFile.c_str(),"w");
if (!fout)
{
- cmSystemTools::Error("Failed to open TclInit file for ", tempOutputFile.c_str());
+ cmSystemTools::Error("Failed to open TclInit file for ",
+ tempOutputFile.c_str());
cmSystemTools::ReportLastSystemError("");
return false;
}
diff --git a/Source/cmVariableRequiresCommand.cxx b/Source/cmVariableRequiresCommand.cxx
index b447d23..d7b1376 100644
--- a/Source/cmVariableRequiresCommand.cxx
+++ b/Source/cmVariableRequiresCommand.cxx
@@ -18,7 +18,8 @@
#include "cmCacheManager.h"
// cmLibraryCommand
-bool cmVariableRequiresCommand::InitialPass(std::vector<std::string> const& args)
+bool cmVariableRequiresCommand::InitialPass(std::vector<std::string>const&
+ args)
{
if(args.size() < 3 )
{
@@ -62,13 +63,16 @@ bool cmVariableRequiresCommand::InitialPass(std::vector<std::string> const& args
if(!requirementsMet)
{
std::string message = "Variable assertion failed:\n";
- message += testVariable + " Requires that the following unset variables are set:\n";
+ message += testVariable +
+ " Requires that the following unset variables are set:\n";
message += notSet;
message += "\nPlease set them, or set ";
message += testVariable + " to false, and re-configure.\n";
if(hasAdvanced)
{
- message += "One or more of the required variables is advanced. To set the variable, you must turn on advanced mode in cmake.";
+ message +=
+ "One or more of the required variables is advanced."
+ " To set the variable, you must turn on advanced mode in cmake.";
}
cmSystemTools::Error(message.c_str());
}
diff --git a/Source/cmVariableWatch.cxx b/Source/cmVariableWatch.cxx
index 2f5bd03..b54ff87 100644
--- a/Source/cmVariableWatch.cxx
+++ b/Source/cmVariableWatch.cxx
@@ -44,7 +44,8 @@ void cmVariableWatch::AddWatch(const std::string& variable,
vp->push_back(p);
}
-void cmVariableWatch::RemoveWatch(const std::string& variable, WatchMethod method)
+void cmVariableWatch::RemoveWatch(const std::string& variable,
+ WatchMethod method)
{
cmVariableWatch::VectorOfPairs* vp = &m_WatchMap[variable];
cmVariableWatch::VectorOfPairs::iterator it;
@@ -58,9 +59,11 @@ void cmVariableWatch::RemoveWatch(const std::string& variable, WatchMethod metho
}
}
-void cmVariableWatch::VariableAccessed(const std::string& variable, int access_type) const
+void cmVariableWatch::VariableAccessed(const std::string& variable,
+ int access_type) const
{
- cmVariableWatch::StringToVectorOfPairs::const_iterator mit = m_WatchMap.find(variable);
+ cmVariableWatch::StringToVectorOfPairs::const_iterator mit =
+ m_WatchMap.find(variable);
if ( mit != m_WatchMap.end() )
{
const cmVariableWatch::VectorOfPairs* vp = &mit->second;
diff --git a/Source/cmVariableWatch.h b/Source/cmVariableWatch.h
index 4585492..44bddc5 100644
--- a/Source/cmVariableWatch.h
+++ b/Source/cmVariableWatch.h
@@ -36,7 +36,8 @@ public:
/**
* Add watch to the variable
*/
- void AddWatch(const std::string& variable, WatchMethod method, void* client_data=0);
+ void AddWatch(const std::string& variable, WatchMethod method,
+ void* client_data=0);
void RemoveWatch(const std::string& variable, WatchMethod method);
/**
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index 38cb9ba..012018e 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -77,8 +77,10 @@ ShouldRemove(const cmListFileFunction& lff, cmMakefile& )
void cmWhileFunctionBlocker::
ScopeEnded(cmMakefile &mf)
{
- cmSystemTools::Error("The end of a CMakeLists file was reached with a WHILE statement that was not closed properly. Within the directory: ",
- mf.GetCurrentDirectory());
+ cmSystemTools::Error(
+ "The end of a CMakeLists file was reached with a WHILE statement that "
+ "was not closed properly. Within the directory: ",
+ mf.GetCurrentDirectory());
}
bool cmWhileCommand::InvokeInitialPass(
diff --git a/Source/cmWin32ProcessExecution.cxx b/Source/cmWin32ProcessExecution.cxx
index 214bebb..d41ad58 100644
--- a/Source/cmWin32ProcessExecution.cxx
+++ b/Source/cmWin32ProcessExecution.cxx
@@ -106,7 +106,8 @@ inline bool IsWinNT()
//---------------------------------------------------------------------------
bool cmWin32ProcessExecution::BorlandRunCommand(
const char* command, const char* dir,
- std::string& output, int& retVal, bool verbose, int /* timeout */, bool hideWindows)
+ std::string& output, int& retVal, bool verbose, int /* timeout */,
+ bool hideWindows)
{
//verbose = true;
//std::cerr << std::endl
diff --git a/Source/cmXCode21Object.cxx b/Source/cmXCode21Object.cxx
index 43db6d1..cd94c1d 100644
--- a/Source/cmXCode21Object.cxx
+++ b/Source/cmXCode21Object.cxx
@@ -25,7 +25,8 @@ void cmXCode21Object::PrintComment(std::ostream& out)
}
-void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v, std::ostream& out, PBXType t)
+void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v,
+ std::ostream& out, PBXType t)
{
bool hasOne = false;
for(std::vector<cmXCodeObject*>::const_iterator i = v.begin();
@@ -55,7 +56,8 @@ void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v, std::ostre
out << "/* End " << PBXTypeNames[t] << " section */\n";
}
-void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v, std::ostream& out)
+void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v,
+ std::ostream& out)
{
cmXCodeObject::Indent(1, out);
out << "objects = {\n";
@@ -69,11 +71,13 @@ void cmXCode21Object::PrintList(std::vector<cmXCodeObject*> const& v, std::ostre
cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXHeadersBuildPhase);
cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXNativeTarget);
cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXProject);
- cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXShellScriptBuildPhase);
+ cmXCode21Object::PrintList(v, out,
+ cmXCode21Object::PBXShellScriptBuildPhase);
cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXResourcesBuildPhase);
cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXSourcesBuildPhase);
cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXApplicationReference);
- cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXExecutableFileReference);
+ cmXCode21Object::PrintList(v, out,
+ cmXCode21Object::PBXExecutableFileReference);
cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXLibraryReference);
cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXToolTarget);
cmXCode21Object::PrintList(v, out, cmXCode21Object::PBXLibraryTarget);
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index 345bc57..4474b72 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -8,7 +8,8 @@ const char* cmXCodeObject::PBXTypeNames[] = {
"PBXTargetDependency", "PBXShellScriptBuildPhase",
"PBXResourcesBuildPhase", "PBXApplicationReference",
"PBXExecutableFileReference", "PBXLibraryReference", "PBXToolTarget",
- "PBXLibraryTarget", "PBXAggregateTarget", "XCBuildConfiguration", "XCConfigurationList",
+ "PBXLibraryTarget", "PBXAggregateTarget", "XCBuildConfiguration",
+ "XCConfigurationList",
"None"
};
@@ -118,7 +119,8 @@ void cmXCodeObject::Print(std::ostream& out)
{
std::map<cmStdString, cmXCodeObject*>::iterator j;
out << i->first << " = {" << separator;
- for(j = object->m_ObjectAttributes.begin(); j != object->m_ObjectAttributes.end(); ++j)
+ for(j = object->m_ObjectAttributes.begin(); j !=
+ object->m_ObjectAttributes.end(); ++j)
{
cmXCodeObject::Indent(4 *indentFactor, out);
out << j->first << " = " << j->second->m_String << ";";
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 1b52f26..cc8e80d 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -76,7 +76,8 @@ static const cmDocumentationEntry cmDocumentationOptions[] =
"Only load the cache. Do not actually run configure and generate steps."},
{"-P <file>", "Process script mode.",
"Process the given cmake file as a script written in the CMake language. "
- "No configure or generate step is performed and the cache is not modified."},
+ "No configure or generate step is performed and the cache is not"
+ " modified."},
{"--help-command cmd [file]", "Print help for a single command and exit.",
"Full documentation specific to the given command is displayed."},
{"--help-command-list [file]", "List available listfile commands and exit.",
@@ -133,7 +134,8 @@ int do_cmake(int ac, char** av)
if ( cmSystemTools::GetCurrentWorkingDirectory().size() == 0 )
{
- std::cerr << "Current working directory cannot be established." << std::endl;
+ std::cerr << "Current working directory cannot be established."
+ << std::endl;
nocwd = 1;
}
@@ -173,7 +175,9 @@ int do_cmake(int ac, char** av)
#else
if ( nocwd || ac == 1 )
{
- std::cout << "Bootstrap CMake should not be used outside CMake build process." << std::endl;
+ std::cout <<
+ "Bootstrap CMake should not be used outside CMake build process."
+ << std::endl;
return 0;
}
#endif
@@ -253,7 +257,8 @@ int do_cmake(int ac, char** av)
int res = cm.Run(args, view_only);
if ( list_cached || list_all_cached )
{
- cmCacheManager::CacheIterator it = cm.GetCacheManager()->GetCacheIterator();
+ cmCacheManager::CacheIterator it =
+ cm.GetCacheManager()->GetCacheIterator();
std::cout << "-- Cache values" << std::endl;
for ( it.Begin(); !it.IsAtEnd(); it.Next() )
{
@@ -268,7 +273,8 @@ int do_cmake(int ac, char** av)
{
std::cout << "// " << it.GetProperty("HELPSTRING") << std::endl;
}
- std::cout << it.GetName() << ":" << cmCacheManager::TypeToString(it.GetType())
+ std::cout << it.GetName() << ":" <<
+ cmCacheManager::TypeToString(it.GetType())
<< "=" << it.GetValue() << std::endl;
if ( list_help )
{