diff options
| author | Nicolas Fella <6377822+nicolasfella@users.noreply.github.com> | 2021-09-24 21:41:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 12:41:20 -0700 |
| commit | 59a3f35e7e5a3281e59863a4a0123c325899f8f9 (patch) | |
| tree | 6ff088ea7a04a28f4c134da526a85be256eb169a /scripts/cmake | |
| parent | a4368eabea44fa350b8aad89a9974b0a17eeefcd (diff) | |
| download | vcpkg-59a3f35e7e5a3281e59863a4a0123c325899f8f9.tar.gz vcpkg-59a3f35e7e5a3281e59863a4a0123c325899f8f9.zip | |
[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
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_make.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 067bf4da0..a80641512 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()
|