From 59a3f35e7e5a3281e59863a4a0123c325899f8f9 Mon Sep 17 00:00:00 2001 From: Nicolas Fella <6377822+nicolasfella@users.noreply.github.com> Date: Fri, 24 Sep 2021 21:41:20 +0200 Subject: [PATCH] [vcpkg_configure_make] Force libdir to lib (#19666) Some Linux distributions (e.g. the OpenSUSE family) defaults to lib64 instead of lib, which breaks vcpkg's assumtion that libraries are in lib. Use the --libdir option of autotools to force the directory to be lib --- scripts/cmake/vcpkg_configure_make.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 067bf4da011f8c..a806415126062a 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -491,7 +491,7 @@ function(vcpkg_configure_make) # Important: These should all be relative to prefix! "--bindir=${prefix_var}/tools/${PORT}/bin" "--sbindir=${prefix_var}/tools/${PORT}/sbin" - #"--libdir='\${prefix}'/lib" # already the default! + "--libdir=${prefix_var}/lib" # On some Linux distributions lib64 is the default #"--includedir='\${prefix}'/include" # already the default! "--mandir=${prefix_var}/share/${PORT}" "--docdir=${prefix_var}/share/${PORT}" @@ -500,7 +500,7 @@ function(vcpkg_configure_make) # Important: These should all be relative to prefix! "--bindir=${prefix_var}/../tools/${PORT}/debug/bin" "--sbindir=${prefix_var}/../tools/${PORT}/debug/sbin" - #"--libdir='\${prefix}'/lib" # already the default! + "--libdir=${prefix_var}/lib" # On some Linux distributions lib64 is the default "--includedir=${prefix_var}/../include" "--datarootdir=${prefix_var}/share/${PORT}") endif()