diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-01-16 13:16:12 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-01-16 13:16:12 +0200 |
| commit | 2f00eef6b40568643150af3bdb78c8b6ccf080c2 (patch) | |
| tree | 83c60340328516dcb8778c4b019cb85c16bd6738 /indra | |
| parent | a542ceb7e1667b7ee71c9f6bda4ea6e3f8583f53 (diff) | |
SL-14597 Fixed mac library only including symlink
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 578120f703..de81512eef 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -167,6 +167,8 @@ elseif(DARWIN) libnghttp2.14.dylib libnghttp2.14.19.0.dylib liburiparser.dylib + liburiparser.1.dylib + liburiparser.1.0.27.dylib ) if (FMODSTUDIO) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index bc121c92ac..0c9fd3984b 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1036,7 +1036,7 @@ class DarwinManifest(ViewerManifest): # libnghttp2.major.dylib, which is a symlink to # libnghttp2.version.dylib. Get all of them. "libnghttp2.*dylib", - "liburiparser.dylib", + "liburiparser.*dylib", ): dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) |