3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 02:11:58 +08:00
Code Issues Projects Releases Wiki Activity

[applocal.py] Don't try to install dependencies not managed by vcpkg (#16716)

Browse Source 
This fixes build failures on osx when using dependencies not coming
from vcpkg (e.g. closed binaries). vcpkg tried to install those
dependencies (which fails because they're not where vcpkg expects them).

Fixes issue #8203

Co-authored-by: Martijn Otto <git@martijnotto.nl>
This commit is contained in:
omartijn 2021-03-15 23:47:08 +01:00 committed by GitHub
parent 5f3249e50e
commit 24625921aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/buildsystems/osx/applocal.py
View File

@ -259,6 +259,11 @@ def fix_dependency(binary, dep):
else: else:
return True return True
# if the source path doesn't exist it's probably not a dependency
# originating with vcpkg and we should leave it alone
if not os.path.exists(qtnamesrc):
return True
dep_ok = True dep_ok = True
# check that rpath of 'dep' inside binary has been correctly set # check that rpath of 'dep' inside binary has been correctly set
# (ie: relative to exepath using '@executable_path' syntax) # (ie: relative to exepath using '@executable_path' syntax)
@ -417,4 +422,4 @@ def main():
if __name__ == "__main__": if __name__ == "__main__":
main() main()