diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2020-02-23 15:08:46 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-02-23 15:08:46 +0100 |
| commit | 5c57d0e3bf045ad32634ffbf385f553075057ddf (patch) | |
| tree | 3ada55cd2499e517cf3e37acfc44ed213cdc292a /default_build_settings.cmake | |
| parent | 5c105fa6ffe3ed27c633e48f17206d2b31307936 (diff) | |
Fedora 32 has been branched from Fedora rawhide.
Add setting for Ubuntu 19.10, drop setting for Ubuntu 18.10.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index e29e4c32017..a23a8f1489a 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -80,11 +80,17 @@ function(setup_vespa_default_build_settings_fedora_32) set(DEFAULT_VESPA_LLVM_VERSION "10" PARENT_SCOPE) endfunction() -function(setup_vespa_default_build_settings_ubuntu_18_10) - message("-- Setting up default build settings for ubuntu 18.10") - set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib" "/usr/lib/llvm-6.0/lib" PARENT_SCOPE) - set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/lib/llvm-6.0/include" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "6.0" PARENT_SCOPE) +function(setup_vespa_default_build_settings_fedora_33) + message("-- Setting up default build settings for fedora 33") + set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "10" PARENT_SCOPE) +endfunction() + +function(setup_vespa_default_build_settings_ubuntu_19_10) + message("-- Setting up default build settings for ubuntu 19.10") + set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib" "/usr/lib/llvm-9/lib" PARENT_SCOPE) + set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/lib/llvm-9/include" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "9" PARENT_SCOPE) endfunction() function(vespa_use_default_vespa_unprivileged) @@ -173,8 +179,10 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_fedora_31() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 32") setup_vespa_default_build_settings_fedora_32() - elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "ubuntu 18.10") - setup_vespa_default_build_settings_ubuntu_18_10() + elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 33") + setup_vespa_default_build_settings_fedora_33() + elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "ubuntu 19.10") + setup_vespa_default_build_settings_ubuntu_19_10() else() message(FATAL_ERROR "-- Unkonwn vespa build platform ${VESPA_OS_DISTRO_COMBINED}") endif() |