wrapper: qualify all dependency library paths with BINARY_DIR
This commit is contained in:
parent
d29c4023a2
commit
4f30436a8d
@ -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(
|
||||
|
Loading…
Reference in New Issue
Block a user