diff options
| -rw-r--r-- | default_build_settings.cmake | 15 | ||||
| -rw-r--r-- | functions.cmake | 10 |
2 files changed, 19 insertions, 6 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() diff --git a/functions.cmake b/functions.cmake index bdecc2f5124..0152554669a 100644 --- a/functions.cmake +++ b/functions.cmake @@ -702,7 +702,15 @@ function(vespa_detect_build_platform) file(STRINGS /etc/os-release OS_DISTRO REGEX "^ID=") string(REGEX REPLACE "ID=\"?([^\"]+)\"?" "\\1" OS_DISTRO ${OS_DISTRO}) file(STRINGS /etc/os-release OS_DISTRO_VERSION REGEX "^VERSION_ID=") - string(REGEX REPLACE "VERSION_ID=\"?([^\"]+)\"?" "\\1" OS_DISTRO_VERSION ${OS_DISTRO_VERSION}) + if(OS_DISTRO_VERSION) + string(REGEX REPLACE "VERSION_ID=\"?([^\"]+)\"?" "\\1" OS_DISTRO_VERSION ${OS_DISTRO_VERSION}) + else() + if (OS_DISTRO STREQUAL "debian") + set(OS_DISTRO_VERSION "sid") + else() + message(FATAL_ERROR "-- Could not determine ${OS_DISTRO} version") + endif() + endif() elseif(EXISTS /etc/redhat-release) set(OS_DISTRO "rhel") file(STRINGS "/etc/redhat-release" OS_DISTRO_VERSION) |