[Cmake-commits] CMake branch, master, updated. v3.7.1-841-g3874843
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, master has been updated via 3874843f0f5be9d53001517b3697e0d092f0e845 (commit) from cf2d33305fb233042ca880216bc83108b55785dc (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3874843f0f5be9d53001517b3697e0d092f0e845 commit 3874843f0f5be9d53001517b3697e0d092f0e845 Author: Kitware Robot AuthorDate: Mon Dec 12 00:01:04 2016 -0500 Commit: Kitware Robot CommitDate: Mon Dec 12 00:01:04 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 80ca7d5..d484bee 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 7) -set(CMake_VERSION_PATCH 20161211) +set(CMake_VERSION_PATCH 20161212) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1700-gaaa7759
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 aaa775916df2d1dbe5e09c91d0238f8271978c7c (commit) via b046f1f16171e79d4877e96dedd2176a682529f2 (commit) from 19cdfe464bf366f900aea1d6b60b506b96bd850f (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aaa775916df2d1dbe5e09c91d0238f8271978c7c commit aaa775916df2d1dbe5e09c91d0238f8271978c7c Merge: 19cdfe4 b046f1f Author: Daniel Pfeifer AuthorDate: Sun Dec 11 15:42:53 2016 -0500 Commit: CMake Topic Stage CommitDate: Sun Dec 11 15:42:53 2016 -0500 Merge topic 'rebuild-lexers' into next b046f1f1 fixup! Regenerate lexer source code https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b046f1f16171e79d4877e96dedd2176a682529f2 commit b046f1f16171e79d4877e96dedd2176a682529f2 Author: Daniel Pfeifer AuthorDate: Sun Dec 11 21:42:24 2016 +0100 Commit: Daniel Pfeifer CommitDate: Sun Dec 11 21:42:24 2016 +0100 fixup! Regenerate lexer source code diff --git a/Source/cmStandardLexer.h b/Source/cmStandardLexer.h index f906e47..1790aae 100644 --- a/Source/cmStandardLexer.h +++ b/Source/cmStandardLexer.h @@ -23,6 +23,7 @@ #if !defined(__INTEL_COMPILER) #pragma GCC diagnostic ignored "-Wconversion" #pragma GCC diagnostic ignored "-Wsign-compare" +#pragma GCC diagnostic ignored "-Wsign-conversion" #endif #endif --- Summary of changes: Source/cmStandardLexer.h |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1698-g19cdfe4
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 19cdfe464bf366f900aea1d6b60b506b96bd850f (commit) via bfd06cc1b32a386690f6aa071f921947533da03c (commit) from 15fd34c75455508eb1d7cc95c2ed475b6cc503a1 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19cdfe464bf366f900aea1d6b60b506b96bd850f commit 19cdfe464bf366f900aea1d6b60b506b96bd850f Merge: 15fd34c bfd06cc Author: Daniel Pfeifer AuthorDate: Sun Dec 11 15:37:41 2016 -0500 Commit: CMake Topic Stage CommitDate: Sun Dec 11 15:37:41 2016 -0500 Merge topic 'rebuild-lexers' into next bfd06cc1 fixup! Regenerate lexer source code https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bfd06cc1b32a386690f6aa071f921947533da03c commit bfd06cc1b32a386690f6aa071f921947533da03c Author: Daniel Pfeifer AuthorDate: Sun Dec 11 21:33:04 2016 +0100 Commit: Daniel Pfeifer CommitDate: Sun Dec 11 21:33:04 2016 +0100 fixup! Regenerate lexer source code diff --git a/Source/cmStandardLexer.h b/Source/cmStandardLexer.h index e0bee61..f906e47 100644 --- a/Source/cmStandardLexer.h +++ b/Source/cmStandardLexer.h @@ -20,9 +20,11 @@ #endif #if defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402 +#if !defined(__INTEL_COMPILER) #pragma GCC diagnostic ignored "-Wconversion" #pragma GCC diagnostic ignored "-Wsign-compare" #endif +#endif /* Make sure isatty is available. */ #if defined(_WIN32) && !defined(__CYGWIN__) --- Summary of changes: Source/cmStandardLexer.h |2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.1-1696-g15fd34c
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 15fd34c75455508eb1d7cc95c2ed475b6cc503a1 (commit)
via 1d8f0dd7836889944fd491c639e4010e97bc5e84 (commit)
from 0cfcc2e3e5b7eb312b82ceddeabf1e696feea2d4 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15fd34c75455508eb1d7cc95c2ed475b6cc503a1
commit 15fd34c75455508eb1d7cc95c2ed475b6cc503a1
Merge: 0cfcc2e 1d8f0dd
Author: Daniel Pfeifer
AuthorDate: Sun Dec 11 15:24:58 2016 -0500
Commit: CMake Topic Stage
CommitDate: Sun Dec 11 15:24:58 2016 -0500
Merge topic 'clang-tidy' into next
1d8f0dd7 fixup! clang-tidy: apply modernize-use-bool-literals fixes
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1d8f0dd7836889944fd491c639e4010e97bc5e84
commit 1d8f0dd7836889944fd491c639e4010e97bc5e84
Author: Daniel Pfeifer
AuthorDate: Sun Dec 11 21:22:58 2016 +0100
Commit: Daniel Pfeifer
CommitDate: Sun Dec 11 21:22:58 2016 +0100
fixup! clang-tidy: apply modernize-use-bool-literals fixes
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 43b18dd..e70bbfe 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -351,7 +351,8 @@ std::string cmGeneratorExpression::Preprocess(const
std::string& input,
return stripExportInterface(input, context, resolveRelative);
}
- assert(!"cmGeneratorExpression::Preprocess called with invalid args");
+ assert(false &&
+ "cmGeneratorExpression::Preprocess called with invalid args");
return std::string();
}
diff --git a/Source/cmGeneratorExpressionNode.cxx
b/Source/cmGeneratorExpressionNode.cxx
index 9623e27..398f95b 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1377,7 +1377,7 @@ cmPolicies::PolicyStatus
statusForTarget(cmGeneratorTarget const* tgt,
#undef RETURN_POLICY
- assert(!"Unreachable code. Not a valid policy");
+ assert(false && "Unreachable code. Not a valid policy");
return cmPolicies::WARN;
}
@@ -1392,7 +1392,7 @@ cmPolicies::PolicyID policyForString(const char*
policy_id)
#undef RETURN_POLICY_ID
- assert(!"Unreachable code. Not a valid policy");
+ assert(false && "Unreachable code. Not a valid policy");
return cmPolicies::CMP0002;
}
diff --git a/Source/cmGeneratorExpressionParser.cxx
b/Source/cmGeneratorExpressionParser.cxx
index 25a0176..c33349a 100644
--- a/Source/cmGeneratorExpressionParser.cxx
+++ b/Source/cmGeneratorExpressionParser.cxx
@@ -242,11 +242,11 @@ void cmGeneratorExpressionParser::ParseContent(
if (this->NestingLevel == 0) {
extendText(result, this->it);
} else {
-assert(!"Got unexpected syntax token.");
+assert(false && "Got unexpected syntax token.");
}
assert(this->it != this->Tokens.end());
++this->it;
return;
}
- assert(!"Unhandled token in generator expression.");
+ assert(false && "Unhandled token in generator expression.");
}
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index ccd3bfa..b6db0d6 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3389,7 +3389,8 @@ const char*
getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt,
{
switch (t) {
case BoolType:
- assert(!"String compatibility check function called for boolean");
+ assert(false &&
+ "String compatibility check function called for boolean");
return CM_NULLPTR;
case StringType:
return tgt->GetLinkInterfaceDependentStringProperty(prop, config);
@@ -3398,7 +3399,7 @@ const char*
getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt,
case NumberMaxType:
return tgt->GetLinkInterfaceDependentNumberMaxProperty(prop, config);
}
- assert(!"Unreachable!");
+ assert(false && "Unreachable!");
return CM_NULLPTR;
}
@@ -3589,7 +3590,7 @@ std::string compatibilityType(CompatibleType t)
case NumberMinType:
return "Numeric minimum compatibility";
}
- assert(!"Unreachable!");
+ assert(false && "Unreachable!");
return "";
}
@@ -3603,7 +3604,7 @@ std::string compatibilityAgree(CompatibleType t, bool
dominant)
case NumberMinType:
return dominant ? "(Dominant)\n" : "(Ignored)\n";
}
- assert(!"Unreachable!");
+ assert(false && "Unreachable!");
return "";
}
@@ -3713,7 +3714,7 @@ std::pair consistentProperty(const
char* lhs,
switch (t) {
case BoolType:
- assert(!"consistentProperty for strings called with BoolType");
+ assert(false && "consistentProperty for strings c
[Cmake-commits] CMake branch, next, updated. v3.7.1-1694-g0cfcc2e
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 0cfcc2e3e5b7eb312b82ceddeabf1e696feea2d4 (commit)
via a6e932533da73b906508e42840c665b89955fb00 (commit)
from 22492e41fbc94575cf126d9f3bde083da9b8 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cfcc2e3e5b7eb312b82ceddeabf1e696feea2d4
commit 0cfcc2e3e5b7eb312b82ceddeabf1e696feea2d4
Merge: 22492e4 a6e9325
Author: Daniel Pfeifer
AuthorDate: Sun Dec 11 03:14:44 2016 -0500
Commit: CMake Topic Stage
CommitDate: Sun Dec 11 03:14:44 2016 -0500
Merge topic 'clang-tidy' into next
a6e93253 fixup! clang-tidy: apply performance-unnecessary-value-param fixes
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6e932533da73b906508e42840c665b89955fb00
commit a6e932533da73b906508e42840c665b89955fb00
Author: Daniel Pfeifer
AuthorDate: Sun Dec 11 09:14:23 2016 +0100
Commit: Daniel Pfeifer
CommitDate: Sun Dec 11 09:14:23 2016 +0100
fixup! clang-tidy: apply performance-unnecessary-value-param fixes
diff --git a/Source/cmProcessOutput.cxx b/Source/cmProcessOutput.cxx
index e2ba58d..617e1ca 100644
--- a/Source/cmProcessOutput.cxx
+++ b/Source/cmProcessOutput.cxx
@@ -52,12 +52,16 @@ cmProcessOutput::~cmProcessOutput()
{
}
-bool cmProcessOutput::DecodeText(std::string const& raw, std::string& decoded,
+bool cmProcessOutput::DecodeText(std::string raw, std::string& decoded,
size_t id)
{
+#if !defined(_WIN32)
+ static_cast(id);
+ decoded.swap(raw);
+ return true;
+#else
bool success = true;
decoded = raw;
-#if defined(_WIN32)
if (id > 0) {
if (rawparts.size() < id) {
rawparts.reserve(id);
@@ -114,10 +118,8 @@ bool cmProcessOutput::DecodeText(std::string const& raw,
std::string& decoded,
success = DoDecodeText(raw, decoded, NULL);
}
}
-#else
- static_cast(id);
-#endif
return success;
+#endif
}
bool cmProcessOutput::DecodeText(const char* data, size_t length,
diff --git a/Source/cmProcessOutput.h b/Source/cmProcessOutput.h
index 0ea8aa1..d2e631f 100644
--- a/Source/cmProcessOutput.h
+++ b/Source/cmProcessOutput.h
@@ -57,7 +57,7 @@ public:
* keep incomplete characters in separate buffers for each stream.
* \return true if successfully decoded \a raw to \a decoded or false if not.
*/
- bool DecodeText(std::string const& raw, std::string& decoded, size_t id = 0);
+ bool DecodeText(std::string raw, std::string& decoded, size_t id = 0);
/**
* Decode \a data with \a length from external encoding to internal
* encoding in \a decoded.
---
Summary of changes:
Source/cmProcessOutput.cxx | 12 +++-
Source/cmProcessOutput.h |2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
