nerdcruft/build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wrapper: qualify all dependency library paths with BINARY_DIR

Browse Source
This commit is contained in:
Danny Robson 2019-10-26 13:04:03 +11:00
parent d29c4023a2
commit 4f30436a8d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wrapper.py.in
View File

@ -111,10 +111,8 @@ def break_path_for_msys2(path):
# to ever deal with... # to ever deal with...
if is_really_windows(): if is_really_windows():
separator = ';' separator = ';'
depsdir = [ depsdir = [ 'bin', 'lib']
f"@CMAKE_CURRENT_BINARY_DIR@/deps/{dir}"
for dir in ['bin', 'lib']
]
# Add the likely path to runtime dependencies for Linux/mingw. # Add the likely path to runtime dependencies for Linux/mingw.
# #
# We want to promote this over the practice of copying DLLs into the # We want to promote this over the practice of copying DLLs into the
@ -128,6 +126,7 @@ else:
depsdir = ['lib', 'lib64'] depsdir = ['lib', 'lib64']
searchvar = 'LD_LIBRARY_PATH' 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 # append the in-tree dependencies to the library path
search = separator.join( search = separator.join(