diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2021-01-20 22:59:24 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2021-01-20 23:42:57 +0100 |
| commit | 58d2e03879c72a544f6da9c73b23849415ae4730 (patch) | |
| tree | 0184eac0292d24fb5110a1f74c71e2c51f15038e /default_build_settings.cmake | |
| parent | f6e8c6d4ad3cb35ef6135f5caf681d314d85f248 (diff) | |
Port to Debian sid.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 597561ed66a..d95d8ac3352 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -89,11 +89,16 @@ function(setup_vespa_default_build_settings_ubuntu_20_04) set(DEFAULT_VESPA_LLVM_VERSION "10" PARENT_SCOPE) endfunction() -function(setup_vespa_default_build_settings_debian_10) - message("-- Setting up default build settings for debian 10") +function(setup_vespa_default_build_settings_debian) + message("-- Setting up default build settings for debian") set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib" PARENT_SCOPE) set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "7" PARENT_SCOPE) + SET(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL) + SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC) + find_package(LLVM REQUIRED CONFIG) + message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") + message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}") + set(DEFAULT_VESPA_LLVM_VERSION ${LLVM_VERSION_MAJOR} PARENT_SCOPE) endfunction() function(vespa_use_default_vespa_unprivileged) @@ -183,8 +188,8 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_ubuntu_19_10() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "ubuntu 20.04") setup_vespa_default_build_settings_ubuntu_20_04() - elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "debian 10") - setup_vespa_default_build_settings_debian_10() + elseif(VESPA_OS_DISTRO STREQUAL "debian") + setup_vespa_default_build_settings_debian() else() message(FATAL_ERROR "-- Unknown vespa build platform ${VESPA_OS_DISTRO_COMBINED}") endif() |