diff options
| author | Tor Egge <Tor.Egge@verizonmedia.com> | 2020-05-14 11:38:03 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@verizonmedia.com> | 2020-05-14 11:38:03 +0200 |
| commit | f809286c9af87369255446e41f3af0aee6164843 (patch) | |
| tree | fb62246ce079ebe20e2a65343a14ddca040bb1ae /default_build_settings.cmake | |
| parent | 82cb4a30a63900c0aa853874e123baaab8162021 (diff) | |
Relax RHEL version checks.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index c9908380f9c..64c918370aa 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -159,10 +159,13 @@ function(vespa_use_default_build_settings) endif() if(VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 6.10") setup_vespa_default_build_settings_rhel_6_10() - elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 7.7" OR - VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 7.8") + elseif(VESPA_OS_DISTRO STREQUAL "rhel" AND + VESPA_OS_DISTRO_VERSION VERSION_GREATER_EQUAL "7" AND + VESPA_OS_DISTRO_VERSION VERSION_LESS "8") setup_vespa_default_build_settings_rhel_7() - elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 8.1") + elseif(VESPA_OS_DISTRO STREQUAL "rhel" AND + VESPA_OS_DISTRO_VERSION VERSION_GREATER_EQUAL "8" AND + VESPA_OS_DISTRO_VERSION VERSION_LESS "9") setup_vespa_default_build_settings_rhel_8() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "centos 7") setup_vespa_default_build_settings_centos_7() |