From c6e575539a4c0f370df65d15001e7f1b942b7e91 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 17 May 2021 11:44:44 +0200 Subject: Clean ECM files after the minimum version change - Remove deprecated version checks - Use VERSION_GREATER_EQUAL --- .../consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tests/ECMGenerateExportHeaderTest/consumer') 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() -- cgit v1.2.1