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/ECMGenerateExportHeaderTest/consumer | |
| 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/ECMGenerateExportHeaderTest/consumer')
| -rw-r--r-- | tests/ECMGenerateExportHeaderTest/consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake | 4 |
1 files changed, 1 insertions, 3 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() |