diff options
| author | Christophe Giboudeaux <christophe@krop.fr> | 2021-05-17 11:44:44 +0200 |
|---|---|---|
| committer | Christophe Giboudeaux <christophe@krop.fr> | 2021-05-25 08:07:34 +0000 |
| commit | c6e575539a4c0f370df65d15001e7f1b942b7e91 (patch) | |
| tree | 5a472c6d8ff4b74b0ff7c74caa742fb00c80d03d /tests | |
| parent | 1312c40ca85e2e5bab6781897b4224cfd04f805a (diff) | |
| download | extra-cmake-modules-c6e575539a4c0f370df65d15001e7f1b942b7e91.tar.gz extra-cmake-modules-c6e575539a4c0f370df65d15001e7f1b942b7e91.tar.bz2 | |
Clean ECM files after the minimum version change
- Remove deprecated version checks
- Use VERSION_GREATER_EQUAL
Diffstat (limited to 'tests')
3 files changed, 5 insertions, 19 deletions
diff --git a/tests/ECMGenerateExportHeaderTest/consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake b/tests/ECMGenerateExportHeaderTest/consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake index 48f8a52e..1f95999c 100644 --- a/tests/ECMGenerateExportHeaderTest/consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake +++ b/tests/ECMGenerateExportHeaderTest/consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake @@ -6,9 +6,7 @@ function(generate_hex_number _var_name _version) string(REGEX REPLACE ${version_regex} "\\2" _version_minor "${_version}") string(REGEX REPLACE ${version_regex} "\\3" _version_patch "${_version}") set(_outputformat) - if (NOT CMAKE_VERSION VERSION_LESS 3.13) - set(_outputformat OUTPUT_FORMAT HEXADECIMAL) - endif() + set(_outputformat OUTPUT_FORMAT HEXADECIMAL) math(EXPR _hexnumber "${_version_major}*65536 + ${_version_minor}*256 + ${_version_patch}" ${_outputformat}) set(${_var_name} ${_hexnumber} PARENT_SCOPE) endfunction() diff --git a/tests/ECMGenerateExportHeaderTest/format_version/CMakeLists.txt b/tests/ECMGenerateExportHeaderTest/format_version/CMakeLists.txt index bcb681d2..428a372a 100644 --- a/tests/ECMGenerateExportHeaderTest/format_version/CMakeLists.txt +++ b/tests/ECMGenerateExportHeaderTest/format_version/CMakeLists.txt @@ -36,11 +36,7 @@ ecm_export_header_format_version(1.2.3 ) assert_var_str_value(_versionstring "1.2.3") -if (NOT CMAKE_VERSION VERSION_LESS 3.13) - assert_var_str_value(_hexnumber "0x10203") -else() - assert_var_str_value(_hexnumber "66051") -endif() +assert_var_str_value(_hexnumber "0x10203") # check some version: no CURRENT_VERSION ecm_export_header_format_version(1.2.3 @@ -49,11 +45,7 @@ ecm_export_header_format_version(1.2.3 ) assert_var_str_value(_versionstring "1.2.3") -if (NOT CMAKE_VERSION VERSION_LESS 3.13) - assert_var_str_value(_hexnumber "0x10203") -else() - assert_var_str_value(_hexnumber "66051") -endif() +assert_var_str_value(_hexnumber "0x10203") # check CURRENT ecm_export_header_format_version(CURRENT @@ -63,10 +55,6 @@ ecm_export_header_format_version(CURRENT ) assert_var_str_value(_versionstring "4.5.6") -if (NOT CMAKE_VERSION VERSION_LESS 3.13) - assert_var_str_value(_hexnumber "0x40506") -else() - assert_var_str_value(_hexnumber "263430") -endif() +assert_var_str_value(_hexnumber "0x40506") add_executable(dummy main.cpp) diff --git a/tests/ECMSetupVersionTest/version_helpers.cmake b/tests/ECMSetupVersionTest/version_helpers.cmake index 6254322f..d8497c9f 100644 --- a/tests/ECMSetupVersionTest/version_helpers.cmake +++ b/tests/ECMSetupVersionTest/version_helpers.cmake @@ -43,7 +43,7 @@ endmacro() macro(version_var_checks prefix version) assert_var_str_value(${prefix}_VERSION "${version}") - if("${ECM_GLOBAL_FIND_VERSION}" VERSION_LESS "5.83.0") + if(ECM_GLOBAL_FIND_VERSION VERSION_LESS 5.83.0) assert_var_str_value(${prefix}_VERSION_STRING "${version}") endif() if("${version}" MATCHES "^([0-9]+)") |