Revert "Add SameMajorVersionWithPreleases compat option to ecm_setup_version."

This reverts commit 959c374c022394a116e8ceb2b1fce2df11752068.

I merged and pushed the wrong branch.

4 files changed, 2 insertions, 196 deletions

diff --git a/tests/ECMSetupVersionTest/CMakeLists.txt b/tests/ECMSetupVersionTest/CMakeLists.txt
index c15af921..b0845e57 100644
--- a/tests/ECMSetupVersionTest/CMakeLists.txt
+++ b/tests/ECMSetupVersionTest/CMakeLists.txt
@@ -19,7 +19,6 @@ add_version_test(old_version_file dummy)
 add_version_test(old_version_file_abspath dummy)
 add_version_test(old_version_file_anynewer dummy)
 add_version_test(old_version_file_exact dummy)
-add_version_test(old_version_file_prereleases dummy)
 add_version_test(old_version_file_samemajor dummy)
 add_version_test(old_header check_header)
 add_version_test(old_header_abspath check_header)
diff --git a/tests/ECMSetupVersionTest/old_version_file_prereleases/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_prereleases/CMakeLists.txt
deleted file mode 100644
index e498fce6..00000000
--- a/tests/ECMSetupVersionTest/old_version_file_prereleases/CMakeLists.txt
+++ /dev/null
@@ -1,189 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-
-project(old_version_file_prereleases)
-
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
-include(ECMSetupVersion)
-
-ecm_setup_version(2.3.4
-    VARIABLE_PREFIX Foo
-    PACKAGE_VERSION_FILE FooVersion.cmake
-        COMPATIBILITY SameMajorVersionWithPrereleases
-        FIRST_PRERELEASE_VERSION 90
-)
-
-include(../../test_helpers.cmake)
-include(../version_helpers.cmake)
-
-macro(find_foo version)
-    test_version_file("${CMAKE_CURRENT_BINARY_DIR}/FooVersion.cmake" "${version}")
-    assert_var_str_value(PACKAGE_VERSION "2.3.4")
-endmacro()
-
-standard_version_var_checks(Foo 2.3.4)
-
-# too old - fails
-find_foo("3.1.1")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# wrong major version - fails
-find_foo("1.1.1")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# wrong major version - fails
-find_foo("1")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# prerelease for wrong major version - fails
-find_foo("2.90.0")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# prerelease for correct major version - succeeds
-find_foo("1.90")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# prerelease for correct major version - succeeds
-find_foo("1.90.1")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# prerelease for correct major version - succeeds
-find_foo("1.95.0")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# correct major version, more recent - succeeds
-find_foo("2.1.1")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# correct major version - succeeds
-find_foo("2")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# correct major version, but too old - fails
-find_foo("2.4.4")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# exact - succeeds
-find_foo("2.3.4")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
-assert_var_bool_value(PACKAGE_VERSION_EXACT TRUE)
-
-
-
-
-ecm_setup_version(2.90.0
-    VARIABLE_PREFIX Foo3Prerelease
-    PACKAGE_VERSION_FILE Foo3PrereleaseVersion.cmake
-        COMPATIBILITY SameMajorVersionWithPrereleases
-        FIRST_PRERELEASE_VERSION 90
-)
-
-macro(find_foo version)
-    test_version_file("${CMAKE_CURRENT_BINARY_DIR}/Foo3PrereleaseVersion.cmake" "${version}")
-    assert_var_str_value(PACKAGE_VERSION "2.90.0")
-endmacro()
-
-standard_version_var_checks(Foo3Prerelease 2.90.0)
-
-# too old - fails
-find_foo("3.1.1")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# too old - fails
-find_foo("2.90.1")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# wrong major version - fails
-find_foo("1")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# wrong major version - fails
-find_foo("2")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# correct major version, but don't want a prerelease - fails
-find_foo("3")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# wrong major version - fails
-find_foo("2.89.9")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# exact version - succeeds
-find_foo("2.90.0")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
-assert_var_bool_value(PACKAGE_VERSION_EXACT TRUE)
-
-
-
-
-ecm_setup_version(2.93.4
-    VARIABLE_PREFIX Foo3Prerelease2
-    PACKAGE_VERSION_FILE Foo3Prerelease2Version.cmake
-        COMPATIBILITY SameMajorVersionWithPrereleases
-        FIRST_PRERELEASE_VERSION 90
-)
-
-macro(find_foo version)
-    test_version_file("${CMAKE_CURRENT_BINARY_DIR}/Foo3Prerelease2Version.cmake" "${version}")
-    assert_var_str_value(PACKAGE_VERSION "2.93.4")
-endmacro()
-
-standard_version_var_checks(Foo3Prerelease2 2.93.4)
-
-# too old - fails
-find_foo("3.1.1")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# too old - fails
-find_foo("2.94.0")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# wrong major version - fails
-find_foo("1")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# wrong major version - fails
-find_foo("2")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# correct major version, but don't want a prerelease - fails
-find_foo("3")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# wrong major version - fails
-find_foo("2.89.9")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE FALSE ALLOW_UNDEFINED)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# correct major version - succeeds
-find_foo("2.90.0")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
-assert_var_bool_value(PACKAGE_VERSION_EXACT FALSE ALLOW_UNDEFINED)
-
-# exact version - succeeds
-find_foo("2.93.4")
-assert_var_bool_value(PACKAGE_VERSION_COMPATIBLE TRUE)
-assert_var_bool_value(PACKAGE_VERSION_EXACT TRUE)
-
-add_executable(dummy main.c)
diff --git a/tests/ECMSetupVersionTest/old_version_file_prereleases/main.c b/tests/ECMSetupVersionTest/old_version_file_prereleases/main.c
deleted file mode 100644
index c13815ce..00000000
--- a/tests/ECMSetupVersionTest/old_version_file_prereleases/main.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int main()
-{
-   return 0;
-}
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()