Adjust compiler options for RHEL 8 to get openblas header files.
Use same default build settings setup function for minor RHEL releases.
@@ -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")
