[Cmake-commits] CMake branch, next, updated. v3.6.1-1194-gdaf8cd4
Brad King
brad.king at kitware.com
Tue Aug 9 09:30:28 EDT 2016
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 daf8cd4836854ba7640edeb629d9049e9f89a8f3 (commit)
via f38a17f8898caca1019d5b1952760315bab7aeca (commit)
via 62a18526df331e96c3e3e5a3fc4dcaec24657f80 (commit)
from abfa2025ae10de25d5135b6ad010750c0addd3f7 (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=daf8cd4836854ba7640edeb629d9049e9f89a8f3
commit daf8cd4836854ba7640edeb629d9049e9f89a8f3
Merge: abfa202 f38a17f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 9 09:30:27 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 9 09:30:27 2016 -0400
Merge topic 'add-extra-boolean-comparisons' into next
f38a17f8 fixup! Add additional <= and >= comparison operators
62a18526 fixup! Add additional <= and >= comparison operators
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f38a17f8898caca1019d5b1952760315bab7aeca
commit f38a17f8898caca1019d5b1952760315bab7aeca
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 9 09:24:04 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 9 09:24:04 2016 -0400
fixup! Add additional <= and >= comparison operators
diff --git a/Help/release/dev/add-extra-boolean-comparisons.rst b/Help/release/dev/add-extra-boolean-comparisons.rst
index a69b212..a928994 100644
--- a/Help/release/dev/add-extra-boolean-comparisons.rst
+++ b/Help/release/dev/add-extra-boolean-comparisons.rst
@@ -1,5 +1,6 @@
add-extra-boolean-comparisons
-----------------------------
-* Add LESS_EQUAL, GREATER_EQUAL, and thier associated STR and VERSION
- equivalents to use the combined <= and >= functionality.
+* The :command:`if` command gained new boolean comparison operations
+ ``LESS_EQUAL``, ``GREATER_EQUAL``, ``STRLESS_EQUAL``, ``STRGREATER_EQUAL``,
+ ``VERSION_LESS_EQUAL``, and ``VERSION_GREATER_EQUAL``.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62a18526df331e96c3e3e5a3fc4dcaec24657f80
commit 62a18526df331e96c3e3e5a3fc4dcaec24657f80
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 9 09:21:32 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 9 09:21:32 2016 -0400
fixup! Add additional <= and >= comparison operators
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 141a00e..8a856a8 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -366,9 +366,8 @@ bool cmCTest::ShouldCompressTestOutput()
if (!this->ComputedCompressTestOutput) {
std::string cdashVersion = this->GetCDashVersion();
// version >= 1.6?
- bool cdashSupportsGzip =
- cmSystemTools::VersionCompare(cmSystemTools::OP_GREATER_EQUAL,
- cdashVersion.c_str(), "1.6");
+ bool cdashSupportsGzip = cmSystemTools::VersionCompare(
+ cmSystemTools::OP_GREATER_EQUAL, cdashVersion.c_str(), "1.6");
this->CompressTestOutput &= cdashSupportsGzip;
this->ComputedCompressTestOutput = true;
}
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 705fc7d..3c913ee 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -484,9 +484,9 @@ bool cmStringCommand::HandleCompareCommand(
return false;
}
std::string mode = args[1];
- if ((mode == "EQUAL") || (mode == "NOTEQUAL") ||
- (mode == "LESS") || (mode == "LESS_EQUAL") ||
- (mode == "GREATER") || (mode == "GREATER_EQUAL")) {
+ if ((mode == "EQUAL") || (mode == "NOTEQUAL") || (mode == "LESS") ||
+ (mode == "LESS_EQUAL") || (mode == "GREATER") ||
+ (mode == "GREATER_EQUAL")) {
if (args.size() < 5) {
std::string e = "sub-command COMPARE, mode ";
e += mode;
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index f031273..d0a28e1 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -284,10 +284,10 @@ public:
enum CompareOp
{
- OP_EQUAL = 1,
- OP_LESS = 2,
+ OP_EQUAL = 1,
+ OP_LESS = 2,
OP_GREATER = 4,
- OP_LESS_EQUAL = OP_LESS | OP_EQUAL,
+ OP_LESS_EQUAL = OP_LESS | OP_EQUAL,
OP_GREATER_EQUAL = OP_GREATER | OP_EQUAL
};
diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx
index f335d67..3b09229 100644
--- a/Tests/Complex/Executable/complex.cxx
+++ b/Tests/Complex/Executable/complex.cxx
@@ -509,7 +509,8 @@ int main()
#endif
#ifdef SHOULD_NOT_BE_DEFINED_LESS_EQUAL
- cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_LESS_EQUAL is defined.");
+ cmFailed(
+ "IF or SET is broken, SHOULD_NOT_BE_DEFINED_LESS_EQUAL is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_LESS_EQUAL is not defined.");
#endif
@@ -616,13 +617,15 @@ int main()
#endif
#ifdef SHOULD_NOT_BE_DEFINED_STRGREATER
- cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER is defined.");
+ cmFailed(
+ "IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_STRGREATER is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_STRGREATER
- cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER is not defined.");
+ cmFailed(
+ "IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRGREATER is defined.");
#endif
@@ -650,7 +653,7 @@ int main()
#ifndef SHOULD_BE_DEFINED_STRLESS_EQUAL
cmFailed(
- "IF or SET is broken, SHOULD_BE_DEFINED_STRLESS_EQUAL is not defined.");
+ "IF or SET is broken, SHOULD_BE_DEFINED_STRLESS_EQUAL is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRLESS_EQUAL is defined.");
#endif
@@ -698,29 +701,29 @@ int main()
#endif
#ifdef SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL2
- cmFailed(
- "IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL2 is defined.");
+ cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL2 is "
+ "defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL2 is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_STRGREATER_EQUAL2
- cmFailed(
- "IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER_EQUAL2 is not defined.");
+ cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER_EQUAL2 is not "
+ "defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRGREATER_EQUAL2 is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL3
- cmFailed(
- "IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL3 is defined.");
+ cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL3 is "
+ "defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL3 is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_STRGREATER_EQUAL3
- cmFailed(
- "IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER_EQUAL3 is not defined.");
+ cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER_EQUAL3 is not "
+ "defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRGREATER_EQUAL3 is defined.");
#endif
diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx
index eeff948..9e4eaad 100644
--- a/Tests/ComplexOneConfig/Executable/complex.cxx
+++ b/Tests/ComplexOneConfig/Executable/complex.cxx
@@ -509,13 +509,15 @@ int main()
#endif
#ifdef SHOULD_NOT_BE_DEFINED_LESS_EQUAL
- cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_LESS_EQUAL is defined.");
+ cmFailed(
+ "IF or SET is broken, SHOULD_NOT_BE_DEFINED_LESS_EQUAL is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_LESS_EQUAL is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_LESS_EQUAL
- cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_LESS_EQUAL is not defined.");
+ cmFailed(
+ "IF or SET is broken, SHOULD_BE_DEFINED_LESS_EQUAL is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_LESS_EQUAL is defined.");
#endif
@@ -615,13 +617,15 @@ int main()
#endif
#ifdef SHOULD_NOT_BE_DEFINED_STRGREATER
- cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER is defined.");
+ cmFailed(
+ "IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_STRGREATER is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_STRGREATER
- cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER is not defined.");
+ cmFailed(
+ "IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRGREATER is defined.");
#endif
@@ -697,29 +701,29 @@ int main()
#endif
#ifdef SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL2
- cmFailed(
- "IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL2 is defined.");
+ cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL2 is "
+ "defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL2 is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_STRGREATER_EQUAL2
- cmFailed(
- "IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER_EQUAL2 is not defined.");
+ cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER_EQUAL2 is not "
+ "defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRGREATER_EQUAL2 is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL3
- cmFailed(
- "IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL3 is defined.");
+ cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL3 is "
+ "defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL3 is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_STRGREATER_EQUAL3
- cmFailed(
- "IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER_EQUAL3 is not defined.");
+ cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER_EQUAL3 is not "
+ "defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRGREATER_EQUAL3 is defined.");
#endif
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/add-extra-boolean-comparisons.rst | 5 ++--
Source/cmCTest.cxx | 5 ++--
Source/cmStringCommand.cxx | 6 ++---
Source/cmSystemTools.h | 6 ++---
Tests/Complex/Executable/complex.cxx | 27 ++++++++++---------
Tests/ComplexOneConfig/Executable/complex.cxx | 28 +++++++++++---------
6 files changed, 42 insertions(+), 35 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list