diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | default_build_settings.cmake | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 082613a83b0..98011efe93a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,7 @@ vespa_use_default_java_home() project(vespa CXX C) vespa_use_default_vespa_unprivileged() vespa_use_default_cmake_install_prefix() +include(GNUInstallDirs) vespa_use_default_vespa_user() vespa_use_default_vespa_group() vespa_use_default_build_settings() diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 266fd87c8cd..3d0db85dc4d 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -94,7 +94,6 @@ endfunction() 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(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL) SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC) @@ -221,7 +220,7 @@ function(vespa_use_default_build_settings) set(DEFAULT_CMAKE_PREFIX_PATH "${VESPA_DEPS}") endif() if(NOT DEFINED DEFAULT_EXTRA_LINK_DIRECTORY) - set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64") + set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/${CMAKE_INSTALL_LIBDIR}") endif() if(NOT DEFINED DEFAULT_EXTRA_INCLUDE_DIRECTORY) set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include") |