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 /modules/ECMGenerateExportHeader.cmake | |
| 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 'modules/ECMGenerateExportHeader.cmake')
| -rw-r--r-- | modules/ECMGenerateExportHeader.cmake | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/modules/ECMGenerateExportHeader.cmake b/modules/ECMGenerateExportHeader.cmake index 7cd1418e..7b05e6fc 100644 --- a/modules/ECMGenerateExportHeader.cmake +++ b/modules/ECMGenerateExportHeader.cmake @@ -394,9 +394,7 @@ function(_ecm_geh_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() @@ -471,9 +469,6 @@ function(ecm_generate_export_header target) elseif(NOT ARGS_VERSION MATCHES ${_version_triple_regexp}) message(FATAL_ERROR "VERSION expected to be in x.y.z format when calling ecm_generate_export_header().") endif() - if (ARGS_INCLUDE_GUARD_NAME AND CMAKE_VERSION VERSION_LESS 3.11) - message(FATAL_ERROR "Argument INCLUDE_GUARD_NAME needs at least CMake 3.11 when calling ecm_generate_export_header().") - endif() if (NOT ARGS_EXCLUDE_DEPRECATED_BEFORE_AND_AT) set(ARGS_EXCLUDE_DEPRECATED_BEFORE_AND_AT 0) elseif(ARGS_EXCLUDE_DEPRECATED_BEFORE_AND_AT STREQUAL "CURRENT") @@ -771,9 +766,7 @@ function(ecm_generate_export_header target) # for older cmake verions we have to manually append our generated content # for newer we use CUSTOM_CONTENT_FROM_VARIABLE set(_custom_content_args) - if (NOT CMAKE_VERSION VERSION_LESS 3.7) - set(_custom_content_args CUSTOM_CONTENT_FROM_VARIABLE _output) - endif() + set(_custom_content_args CUSTOM_CONTENT_FROM_VARIABLE _output) generate_export_header(${target} BASE_NAME ${ARGS_BASE_NAME} DEPRECATED_MACRO_NAME "${_macro_base_name}_DECL_DEPRECATED" @@ -786,14 +779,13 @@ function(ecm_generate_export_header target) ${_custom_content_args} ) - if (CMAKE_VERSION VERSION_LESS 3.7) - if (ARGS_INCLUDE_GUARD_NAME) - set(_include_guard "ECM_GENERATEEXPORTHEADER_${ARGS_INCLUDE_GUARD_NAME}") - else() - set(_include_guard "ECM_GENERATEEXPORTHEADER_${_upper_base_name}_EXPORT_H") - endif() + if (ARGS_INCLUDE_GUARD_NAME) + set(_include_guard "ECM_GENERATEEXPORTHEADER_${ARGS_INCLUDE_GUARD_NAME}") + else() + set(_include_guard "ECM_GENERATEEXPORTHEADER_${_upper_base_name}_EXPORT_H") + endif() - file(APPEND ${_header_work_file} " + file(APPEND ${_header_work_file} " #ifndef ${_include_guard} #define ${_include_guard} @@ -802,8 +794,7 @@ ${_output} #endif /* ${_include_guard} */ " - ) - endif() + ) # avoid rebuilding if there was no change execute_process( |