mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add additional <= and >= comparison operators

Browse Source 
This adds the LESS_EQUAL, GREATER_EQUAL, and associated STR and VERSION
equivalents to use the combined <= and >= functionality.
This commit is contained in:
Chuck Atkins
2016-08-05 14:11:46 -04:00
committed by Brad King
parent 93b705a396
commit 02d177c9cc
18 changed files with 703 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
Tests/ComplexOneConfig/Executable/complex.cxx
View File

@@ -478,18 +478,6 @@ int main()
cmPassed("SHOULD_NOT_BE_DEFINED_GREATER is not defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_EQUAL
cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_EQUAL is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_EQUAL is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_EQUAL
cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_EQUAL is not defined.\n");
#else
cmPassed("SHOULD_BE_DEFINED_EQUAL is defined.");
#endif
#ifndef SHOULD_BE_DEFINED_GREATER
cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_GREATER is not defined.\n");
#else
@@ -503,12 +491,107 @@ int main()
#endif
#ifndef SHOULD_BE_DEFINED_GREATER2
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_GREATER2 is not defined.\n");
cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_GREATER2 is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_GREATER2 is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_EQUAL
cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_EQUAL is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_EQUAL is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_EQUAL
cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_EQUAL is not defined.\n");
#else
cmPassed("SHOULD_BE_DEFINED_EQUAL is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_LESS_EQUAL
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.");
#else
cmPassed("SHOULD_BE_DEFINED_LESS_EQUAL is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_LESS_EQUAL2
cmFailed(
"IF or SET is broken, SHOULD_NOT_BE_DEFINED_LESS_EQUAL2 is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_LESS_EQUAL2 is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_LESS_EQUAL2
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_LESS_EQUAL2 is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_LESS_EQUAL2 is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_LESS_EQUAL3
cmFailed(
"IF or SET is broken, SHOULD_NOT_BE_DEFINED_LESS_EQUAL3 is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_LESS_EQUAL3 is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_LESS_EQUAL3
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_LESS_EQUAL3 is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_LESS_EQUAL3 is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_GREATER_EQUAL
cmFailed(
"IF or SET is broken, SHOULD_NOT_BE_DEFINED_GREATER_EQUAL is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_GREATER_EQUAL is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_GREATER_EQUAL
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_GREATER_EQUAL is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_GREATER_EQUAL is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_GREATER_EQUAL2
cmFailed(
"IF or SET is broken, SHOULD_NOT_BE_DEFINED_GREATER_EQUAL2 is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_GREATER_EQUAL2 is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_GREATER_EQUAL2
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_GREATER_EQUAL2 is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_GREATER_EQUAL2 is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_GREATER_EQUAL3
cmFailed(
"IF or SET is broken, SHOULD_NOT_BE_DEFINED_GREATER_EQUAL3 is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_GREATER_EQUAL3 is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_GREATER_EQUAL3
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_GREATER_EQUAL3 is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_GREATER_EQUAL3 is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_STRLESS
cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRLESS is defined.");
#else
@@ -516,7 +599,7 @@ int main()
#endif
#ifndef SHOULD_BE_DEFINED_STRLESS
cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_STRLESS is not defined.\n");
cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_STRLESS is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRLESS is defined.");
#endif
@@ -528,8 +611,7 @@ int main()
#endif
#ifndef SHOULD_BE_DEFINED_STRLESS2
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_STRLESS2 is not defined.\n");
cmFailed("IF or SET is broken, SHOULD_BE_DEFINED_STRLESS2 is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRLESS2 is defined.");
#endif
@@ -543,7 +625,7 @@ int main()
#ifndef SHOULD_BE_DEFINED_STRGREATER
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER is not defined.\n");
"IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRGREATER is defined.");
#endif
@@ -557,11 +639,95 @@ int main()
#ifndef SHOULD_BE_DEFINED_STRGREATER2
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER2 is not defined.\n");
"IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER2 is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRGREATER2 is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_STRLESS_EQUAL
cmFailed(
"IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRLESS_EQUAL is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_STRLESS_EQUAL is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_STRLESS_EQUAL
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_STRLESS_EQUAL is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRLESS_EQUAL is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_STRLESS_EQUAL2
cmFailed(
"IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRLESS_EQUAL2 is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_STRLESS_EQUAL2 is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_STRLESS_EQUAL2
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_STRLESS_EQUAL2 is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRLESS_EQUAL2 is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_STRLESS_EQUAL3
cmFailed(
"IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRLESS_EQUAL3 is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_STRLESS_EQUAL3 is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_STRLESS_EQUAL3
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_STRLESS_EQUAL3 is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRLESS_EQUAL3 is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL
cmFailed(
"IF or SET is broken, SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL is defined.");
#else
cmPassed("SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL is not defined.");
#endif
#ifndef SHOULD_BE_DEFINED_STRGREATER_EQUAL
cmFailed(
"IF or SET is broken, SHOULD_BE_DEFINED_STRGREATER_EQUAL is not defined.");
#else
cmPassed("SHOULD_BE_DEFINED_STRGREATER_EQUAL is defined.");
#endif
#ifdef SHOULD_NOT_BE_DEFINED_STRGREATER_EQUAL2
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.");
#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.");
#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.");
#else
cmPassed("SHOULD_BE_DEFINED_STRGREATER_EQUAL3 is defined.");
#endif
// ----------------------------------------------------------------------
// Test FOREACH