[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4250-g3964de6
Brad King
brad.king at kitware.com
Thu Sep 19 13:54:41 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 3964de622294b9ce08574aa19131c8f4ab31125b (commit)
via ba12f7857ae08306ce840959aaf386556a206fa1 (commit)
via f250a99da9e404fdd0d6fcfdc2e50a2f20a6a2fd (commit)
via f9a26855547b1b76c02d2a74aa8916998e935f3e (commit)
via 27a3e42831773ee09891b9b1f6181407bc5606a3 (commit)
via fd93939827daea5adfcaf0a1177f7a7d06ca0e88 (commit)
via ecc7613b6984466a31da3ede4083ed700a6b6c85 (commit)
via 6ffadbe46066e82e6d18c2936ae4083bbc336a86 (commit)
from 9f8f4c75e3363c23ee1c857a63a30532740cb7dc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3964de622294b9ce08574aa19131c8f4ab31125b
commit 3964de622294b9ce08574aa19131c8f4ab31125b
Merge: 9f8f4c7 ba12f78
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 19 13:54:39 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 19 13:54:39 2013 -0400
Merge topic 'clang-warnings' into next
ba12f78 Fixed a few doxygen comment errors
f250a99 Populated empty doxygen @param comment
f9a2685 Properly escape @ char in doxygen comments
27a3e42 Fixed warning about \brief usage
fd93939 Add extra space in comment to suppress warning
ecc7613 Removed useless semi-colon.
6ffadbe Fixed typo in header include guard
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba12f7857ae08306ce840959aaf386556a206fa1
commit ba12f7857ae08306ce840959aaf386556a206fa1
Author: Sean McBride <sean at rogue-research.com>
AuthorDate: Thu Sep 19 13:08:38 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 19 13:50:06 2013 -0400
Fixed a few doxygen comment errors
Warned by clang -Wdocumentation
diff --git a/Source/cmDocumentation.h b/Source/cmDocumentation.h
index e180f60..218f44d 100644
--- a/Source/cmDocumentation.h
+++ b/Source/cmDocumentation.h
@@ -154,11 +154,11 @@ public:
/**
* Retrieve the list of documented module located in
* path which match the globing expression globExpr.
- * @param[in] path, directory where to start the search
+ * @param[in] path directory where to start the search
* we will recurse into it.
- * @param[in] globExpr, the globing expression used to
+ * @param[in] globExpr the globing expression used to
* match the file in path.
- * @param[out] the list of obtained pairs (may be empty)
+ * @param[out] docModuleList the list of obtained pairs (may be empty)
* @return 0 on success 1 on error or empty list
*/
int getDocumentedModulesListInDir(
@@ -180,10 +180,9 @@ public:
* @param[in] fname the script file name to be parsed for documentation
* @param[in,out] commands the vector of command/macros documentation
* entry found in the script file.
- * @param[in,out] the cmake object instance to which variable documentation
- * will be attached (using @see cmake::DefineProperty)
- * @param[in] the documentation section in which the property will be
- * inserted.
+ * @param[in,out] cm the cmake object instance to which variable
+ * documentation will be attached
+ * (using @see cmake::DefineProperty)
* @return the number of documented items (command and variable)
* found in the file.
*/
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f250a99da9e404fdd0d6fcfdc2e50a2f20a6a2fd
commit f250a99da9e404fdd0d6fcfdc2e50a2f20a6a2fd
Author: Sean McBride <sean at rogue-research.com>
AuthorDate: Thu Sep 19 13:05:17 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 19 13:50:06 2013 -0400
Populated empty doxygen @param comment
And in one case fixed wrong param name.
Warned by clang -Wdocumentation.
diff --git a/Source/cmCommandArgumentLexer.cxx b/Source/cmCommandArgumentLexer.cxx
index e68f6b5..e62e53e 100644
--- a/Source/cmCommandArgumentLexer.cxx
+++ b/Source/cmCommandArgumentLexer.cxx
@@ -1820,7 +1820,7 @@ void cmCommandArgument_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yysca
}
/** Set the current line number.
- * @param line_number
+ * @param line_number The line number to set.
* @param yyscanner The scanner object.
*/
void cmCommandArgument_yyset_lineno (int line_number , yyscan_t yyscanner)
@@ -1835,7 +1835,7 @@ void cmCommandArgument_yyset_lineno (int line_number , yyscan_t yyscanner)
}
/** Set the current column.
- * @param column_no
+ * @param column_no The column number to set.
* @param yyscanner The scanner object.
*/
void cmCommandArgument_yyset_column (int column_no , yyscan_t yyscanner)
diff --git a/Source/cmDependsFortranLexer.cxx b/Source/cmDependsFortranLexer.cxx
index 924d9d2..1eff1e4 100644
--- a/Source/cmDependsFortranLexer.cxx
+++ b/Source/cmDependsFortranLexer.cxx
@@ -2165,7 +2165,7 @@ void cmDependsFortran_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscan
}
/** Set the current line number.
- * @param line_number
+ * @param line_number The line number to set.
* @param yyscanner The scanner object.
*/
void cmDependsFortran_yyset_lineno (int line_number , yyscan_t yyscanner)
@@ -2180,7 +2180,7 @@ void cmDependsFortran_yyset_lineno (int line_number , yyscan_t yyscanner)
}
/** Set the current column.
- * @param line_number
+ * @param column_no The column number to set.
* @param yyscanner The scanner object.
*/
void cmDependsFortran_yyset_column (int column_no , yyscan_t yyscanner)
diff --git a/Source/cmDependsJavaLexer.cxx b/Source/cmDependsJavaLexer.cxx
index 0af44b0..1e505a5 100644
--- a/Source/cmDependsJavaLexer.cxx
+++ b/Source/cmDependsJavaLexer.cxx
@@ -2330,7 +2330,7 @@ void cmDependsJava_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner
}
/** Set the current line number.
- * @param line_number
+ * @param line_number The line number to set.
* @param yyscanner The scanner object.
*/
void cmDependsJava_yyset_lineno (int line_number , yyscan_t yyscanner)
@@ -2345,7 +2345,7 @@ void cmDependsJava_yyset_lineno (int line_number , yyscan_t yyscanner)
}
/** Set the current column.
- * @param column_no
+ * @param column_no The column number to set.
* @param yyscanner The scanner object.
*/
void cmDependsJava_yyset_column (int column_no , yyscan_t yyscanner)
diff --git a/Source/cmExprLexer.cxx b/Source/cmExprLexer.cxx
index 9947c77..aa384cd 100644
--- a/Source/cmExprLexer.cxx
+++ b/Source/cmExprLexer.cxx
@@ -1716,7 +1716,7 @@ void cmExpr_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner)
}
/** Set the current line number.
- * @param line_number
+ * @param line_number The line number to set.
* @param yyscanner The scanner object.
*/
void cmExpr_yyset_lineno (int line_number , yyscan_t yyscanner)
@@ -1731,7 +1731,7 @@ void cmExpr_yyset_lineno (int line_number , yyscan_t yyscanner)
}
/** Set the current column.
- * @param column_no
+ * @param column_no The column number to set.
* @param yyscanner The scanner object.
*/
void cmExpr_yyset_column (int column_no , yyscan_t yyscanner)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9a26855547b1b76c02d2a74aa8916998e935f3e
commit f9a26855547b1b76c02d2a74aa8916998e935f3e
Author: Sean McBride <sean at rogue-research.com>
AuthorDate: Thu Sep 19 13:03:38 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 19 13:50:05 2013 -0400
Properly escape @ char in doxygen comments
Found by clang's -Wdocumentation.
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 27b74ca..527cbc7 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -372,7 +372,7 @@ public:
/** Get the soname of the target. Allowed only for a shared library. */
std::string GetSOName(const char* config);
- /** Whether this library has @rpath and platform supports it. */
+ /** Whether this library has \@rpath and platform supports it. */
bool HasMacOSXRpath(const char* config);
/** Test for special case of a third-party shared library that has
@@ -421,12 +421,12 @@ public:
bool IsChrpathUsed(const char* config);
/** Return the install name directory for the target in the
- * build tree. For example: "@rpath/", "@loader_path/",
+ * build tree. For example: "\@rpath/", "\@loader_path/",
* or "/full/path/to/library". */
std::string GetInstallNameDirForBuildTree(const char* config);
/** Return the install name directory for the target in the
- * install tree. For example: "@rpath/" or "@loader_path/". */
+ * install tree. For example: "\@rpath/" or "\@loader_path/". */
std::string GetInstallNameDirForInstallTree();
cmComputeLinkInformation* GetLinkInformation(const char* config,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27a3e42831773ee09891b9b1f6181407bc5606a3
commit 27a3e42831773ee09891b9b1f6181407bc5606a3
Author: Sean McBride <sean at rogue-research.com>
AuthorDate: Thu Sep 19 13:02:31 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 19 13:50:05 2013 -0400
Fixed warning about \brief usage
A doxygen \brief is ended with a newline,
so removed newline right after \brief to fix
clang -Wdocumentation warning
diff --git a/Source/cmAddCustomCommandCommand.h b/Source/cmAddCustomCommandCommand.h
index 1cc1e3a..2504185 100644
--- a/Source/cmAddCustomCommandCommand.h
+++ b/Source/cmAddCustomCommandCommand.h
@@ -16,9 +16,7 @@
#include "cmDocumentGeneratorExpressions.h"
/** \class cmAddCustomCommandCommand
- * \brief
- *
- * cmAddCustomCommandCommand defines a new command (rule) that can
+ * \brief cmAddCustomCommandCommand defines a new command (rule) that can
* be executed within the build process
*
*/
diff --git a/Source/cmIncludeCommand.h b/Source/cmIncludeCommand.h
index d97b7c3..8ff8b20 100644
--- a/Source/cmIncludeCommand.h
+++ b/Source/cmIncludeCommand.h
@@ -15,9 +15,7 @@
#include "cmCommand.h"
/** \class cmIncludeCommand
- * \brief
- *
- * cmIncludeCommand defines a list of distant
+ * \brief cmIncludeCommand defines a list of distant
* files that can be "included" in the current list file.
* In almost every sense, this is identical to a C/C++
* #include command. Arguments are first expended as usual.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd93939827daea5adfcaf0a1177f7a7d06ca0e88
commit fd93939827daea5adfcaf0a1177f7a7d06ca0e88
Author: Sean McBride <sean at rogue-research.com>
AuthorDate: Thu Sep 19 13:00:58 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 19 13:50:05 2013 -0400
Add extra space in comment to suppress warning
Clang's -Wdocumentation thought it was
malformed doxygen.
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index 4816da9..3a7070e 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -534,8 +534,8 @@ int cmGraphVizWriter::CollectAllExternalLibs(int cnt)
ostr << this->GraphNodePrefix << cnt++;
this->TargetNamesNodes[libName] = ostr.str();
this->TargetPtrs[libName] = NULL;
- //str << " \"" << ostr.c_str() << "\" [ label=\"" << libName
- //<< "\" shape=\"ellipse\"];" << std::endl;
+ // str << " \"" << ostr.c_str() << "\" [ label=\"" << libName
+ // << "\" shape=\"ellipse\"];" << std::endl;
}
}
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecc7613b6984466a31da3ede4083ed700a6b6c85
commit ecc7613b6984466a31da3ede4083ed700a6b6c85
Author: Sean McBride <sean at rogue-research.com>
AuthorDate: Thu Sep 19 13:00:07 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 19 13:50:05 2013 -0400
Removed useless semi-colon.
Warned by clang.
diff --git a/Source/cmNewLineStyle.cxx b/Source/cmNewLineStyle.cxx
index 6f7b6a9..a7d7429 100644
--- a/Source/cmNewLineStyle.cxx
+++ b/Source/cmNewLineStyle.cxx
@@ -78,7 +78,7 @@ const std::string cmNewLineStyle::GetCharacters() const
return "\r\n";
default:
;
- };
+ }
return "";
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ffadbe46066e82e6d18c2936ae4083bbc336a86
commit 6ffadbe46066e82e6d18c2936ae4083bbc336a86
Author: Sean McBride <sean at rogue-research.com>
AuthorDate: Thu Sep 19 12:59:27 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 19 13:50:05 2013 -0400
Fixed typo in header include guard
From clang's -Wheader-guard.
diff --git a/Utilities/cmcurl/parsedate.h b/Utilities/cmcurl/parsedate.h
index 0ea2d83..b29fe9b 100644
--- a/Utilities/cmcurl/parsedate.h
+++ b/Utilities/cmcurl/parsedate.h
@@ -1,5 +1,5 @@
#ifndef __PARSEDATE_H
-#define __PARSEDATEL_H
+#define __PARSEDATE_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
-----------------------------------------------------------------------
Summary of changes:
Source/cmAddCustomCommandCommand.h | 4 +---
Source/cmCommandArgumentLexer.cxx | 4 ++--
Source/cmDependsFortranLexer.cxx | 4 ++--
Source/cmDependsJavaLexer.cxx | 4 ++--
Source/cmDocumentation.h | 13 ++++++-------
Source/cmExprLexer.cxx | 4 ++--
Source/cmGraphVizWriter.cxx | 4 ++--
Source/cmIncludeCommand.h | 4 +---
Source/cmNewLineStyle.cxx | 2 +-
Source/cmTarget.h | 6 +++---
Utilities/cmcurl/parsedate.h | 2 +-
11 files changed, 23 insertions(+), 28 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list