From 959c374c022394a116e8ceb2b1fce2df11752068 Mon Sep 17 00:00:00 2001 From: Alex Merry 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