From 959c374c022394a116e8ceb2b1fce2df11752068 Mon Sep 17 00:00:00 2001
From: Alex Merry <alex.merry@kde.org>
Date: Sun, 28 Dec 2014 15:03:07 +0000
Subject: Add SameMajorVersionWithPreleases compat option to ecm_setup_version.

SameMajorVersionWithPreleases is intended implement the versioning
scheme followed by many KDE projects: minor releases after some high
number (eg: 90) are considered to be pre-releases of the next major
version, and are not compatible with the current major version. This
allows alpha and beta releases to be ordered correctly by
version-number-aware software like package managers (an alpha of version
2 should have a higher number than any release of version 1, but less
than version 2.0).

So a request for version 2.1.0 of a piece of software should not be
satisfied by 2.93.4, because that is actually a pre-release of version
3. On the other hand, a request for version 2.91.0 should be satisfied
by version 3.1.0.

Note that prereleases are not considered unless explicitly requested, so
2.93.4 will not satisfy requests for version 3 (or version 2) of a piece
of software.
---
 tests/test_helpers.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/test_helpers.cmake')

diff --git a/tests/test_helpers.cmake b/tests/test_helpers.cmake
index 73be343e..236a1868 100644
--- a/tests/test_helpers.cmake
+++ b/tests/test_helpers.cmake
@@ -38,9 +38,9 @@ macro(assert_var_bool_value varname value)
         assert_var_defined(${varname})
     endif()
     if(${value} AND NOT ${varname})
-        message(FATAL_ERROR "${varname} was FALSE")
+        message(SEND_ERROR "${varname} was FALSE")
     elseif(${varname} AND NOT ${value})
-        message(FATAL_ERROR "${varname} was TRUE")
+        message(SEND_ERROR "${varname} was TRUE")
     endif()
 endmacro()
 
-- 
cgit v1.2.1


From d609e598170064b4ee65392177a9d07f4302698d Mon Sep 17 00:00:00 2001
From: Alex Merry <alex.merry@kde.org>
Date: Sat, 24 Jan 2015 14:47:59 +0000
Subject: Revert "Add SameMajorVersionWithPreleases compat option to
 ecm_setup_version."

This reverts commit 959c374c022394a116e8ceb2b1fce2df11752068.

I merged and pushed the wrong branch.
---
 tests/test_helpers.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/test_helpers.cmake')

diff --git a/tests/test_helpers.cmake b/tests/test_helpers.cmake
index 236a1868..73be343e 100644
--- a/tests/test_helpers.cmake
+++ b/tests/test_helpers.cmake
@@ -38,9 +38,9 @@ macro(assert_var_bool_value varname value)
         assert_var_defined(${varname})
     endif()
     if(${value} AND NOT ${varname})
-        message(SEND_ERROR "${varname} was FALSE")
+        message(FATAL_ERROR "${varname} was FALSE")
     elseif(${varname} AND NOT ${value})
-        message(SEND_ERROR "${varname} was TRUE")
+        message(FATAL_ERROR "${varname} was TRUE")
     endif()
 endmacro()
 
-- 
cgit v1.2.1


From be390dcc4d77d7faa95d040b1a346ac3c0405eac Mon Sep 17 00:00:00 2001
From: Alex Merry <alex.merry@kde.org>
Date: Mon, 18 May 2015 19:12:06 +0100
Subject: Add arguments to ecm_add_tests for listing added tests.

This makes it convenient to make further modifications to the tests,
such as setting properties on either the tests or the targets.

CHANGELOG: New arguments for ecm_add_tests().
BUG: 345797
REVIEW: 123841
---
 tests/test_helpers.cmake | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'tests/test_helpers.cmake')

diff --git a/tests/test_helpers.cmake b/tests/test_helpers.cmake
index 73be343e..d9314d25 100644
--- a/tests/test_helpers.cmake
+++ b/tests/test_helpers.cmake
@@ -62,3 +62,31 @@ macro(assert_var_absolute_path varname)
     endif()
 endmacro()
 
+function(assert_vars_setequal varname exp_varname)
+    if(ARGC LESS 3 OR NOT "${ARGV2}" STREQUAL "ALLOW_UNDEFINED")
+        assert_var_defined(${varname})
+    endif()
+    # need real variables
+    set(list1 "${${varname}}")
+    set(list2 "${${exp_varname}}")
+    list(LENGTH list1 list1_len)
+    list(LENGTH list2 list2_len)
+    set(same_els FALSE)
+    if(list1_len EQUAL list2_len)
+        set(same_els TRUE)
+        foreach(item ${list1})
+            list(FIND list2 "${item}" pos)
+            if(pos EQUAL "-1")
+                set(same_els FALSE)
+                break()
+            else()
+                # deal nicely with duplicates
+                list(REMOVE_AT list2 "${pos}")
+            endif()
+        endforeach()
+    endif()
+    if(NOT same_els)
+        message(SEND_ERROR "${varname} is '${${varname}}', expecting '${${exp_varname}}'.")
+    endif()
+endfunction()
+
-- 
cgit v1.2.1