From f8af407eba5c5ea45be2c6351cf41a7cb44fed21 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 28 Dec 2014 16:32:13 +0000 Subject: Improve version file tests. Mostly just refatoring to have less duplicated code. --- .../old_header_abspath/CMakeLists.txt | 24 ++-------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'tests/ECMSetupVersionTest/old_header_abspath') diff --git a/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt index 81428955..cf58887a 100644 --- a/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt +++ b/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt @@ -10,29 +10,9 @@ ecm_setup_version(2.3.4 VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/../ecm_old_header_abspath_version.h" ) -macro(strcheck var val) - if(NOT ${var} STREQUAL "${val}") - message(FATAL_ERROR "${var} was ${${var}} instead of ${val}") - endif() -endmacro() -macro(numcheck var val) - if(NOT ${var} EQUAL "${val}") - message(FATAL_ERROR "${var} was ${${var}} instead of ${val}") - endif() -endmacro() +include(../version_helpers.cmake) -strcheck(PROJECT_VERSION "2.3.4") -strcheck(PROJECT_VERSION_STRING "2.3.4") -numcheck(PROJECT_VERSION_MAJOR 2) -numcheck(PROJECT_VERSION_MINOR 3) -numcheck(PROJECT_VERSION_PATCH 4) - -strcheck(Foo_VERSION "2.3.4") -strcheck(Foo_VERSION_STRING "2.3.4") -numcheck(Foo_VERSION_MAJOR 2) -numcheck(Foo_VERSION_MINOR 3) -numcheck(Foo_VERSION_PATCH 4) -numcheck(Foo_SOVERSION 2) +standard_version_var_checks(Foo 2.3.4) add_executable(check_header main.c) target_include_directories(check_header PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/..") -- cgit v1.2.1