From 4f30436a8d57871e05f38c2d7bd8eb9d73e825a7 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Sat, 26 Oct 2019 13:04:03 +1100 Subject: [PATCH] wrapper: qualify all dependency library paths with BINARY_DIR --- wrapper.py.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/wrapper.py.in b/wrapper.py.in index 09027dc..8d3f99a 100755 --- a/wrapper.py.in +++ b/wrapper.py.in @@ -111,10 +111,8 @@ def break_path_for_msys2(path): # to ever deal with... if is_really_windows(): separator = ';' - depsdir = [ - f"@CMAKE_CURRENT_BINARY_DIR@/deps/{dir}" - for dir in ['bin', 'lib'] - ] + depsdir = [ 'bin', 'lib'] + # Add the likely path to runtime dependencies for Linux/mingw. # # We want to promote this over the practice of copying DLLs into the @@ -128,6 +126,7 @@ else: depsdir = ['lib', 'lib64'] searchvar = 'LD_LIBRARY_PATH' +depsdir = [ f"@CMAKE_CURRENT_BINARY_DIR@/deps/{dir}" for dir in depsdir ] # append the in-tree dependencies to the library path search = separator.join(