diff options
| author | Tor Egge <Tor.Egge@verizonmedia.com> | 2020-04-26 22:26:19 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@verizonmedia.com> | 2020-04-26 22:26:19 +0200 |
| commit | 42a48b1018f06933e9abb8cee700015dcb202e74 (patch) | |
| tree | c96b4428bb516c093dcd87a1c7f4b5617465c923 /default_build_settings.cmake | |
| parent | 7ba5b90e295197f986a35870f6aff24ab3f4f3c3 (diff) | |
Adjust compiler options for RHEL 8 to get openblas header files.
Use same default build settings setup function for minor RHEL releases.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 073d0d17620..67d2be5917d 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -8,15 +8,16 @@ function(setup_vespa_default_build_settings_rhel_6_10) set(DEFAULT_CMAKE_SHARED_LINKER_FLAGS "-lrt" PARENT_SCOPE) endfunction() -function(setup_vespa_default_build_settings_rhel_7_7) - message("-- Setting up default build settings for rhel 7.7") +function(setup_vespa_default_build_settings_rhel_7) + message("-- Setting up default build settings for rhel 7") set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64" "/usr/lib64/llvm7.0/lib" PARENT_SCOPE) set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/llvm7.0" "/usr/include/openblas" PARENT_SCOPE) set(DEFAULT_VESPA_LLVM_VERSION "7" PARENT_SCOPE) endfunction() -function(setup_vespa_default_build_settings_rhel_8_1) - message("-- Setting up default build settings for rhel 8.1") +function(setup_vespa_default_build_settings_rhel_8) + message("-- Setting up default build settings for rhel 8") + set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) set(DEFAULT_VESPA_LLVM_VERSION "8" PARENT_SCOPE) endfunction() @@ -159,9 +160,9 @@ function(vespa_use_default_build_settings) 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") - setup_vespa_default_build_settings_rhel_7_7() + setup_vespa_default_build_settings_rhel_7() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 8.1") - setup_vespa_default_build_settings_rhel_8_1() + setup_vespa_default_build_settings_rhel_8() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "centos 7") setup_vespa_default_build_settings_centos_7() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "centos 8") |