diff options
| author | Tor Egge <Tor.Egge@online.no> | 2022-10-13 15:34:19 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2022-10-13 15:34:19 +0200 |
| commit | 1f729038a5b9d18f92b1f504b4145cb3adfe458b (patch) | |
| tree | 99e6fc28732bde0cfd446e7740a688bfef4b4cf4 /default_build_settings.cmake | |
| parent | d3fefa3ab3db39b713aec3c7cd186c81b468741e (diff) | |
Include GNUInstallDirs, to simplify setup of EXTRA_LINK_DIRECTORY.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
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") |