summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2023-05-02 09:39:03 -0700
committerCallum Prentice <callum@lindenlab.com>2023-05-02 09:39:03 -0700
commitbb96ac2621dd09dbc318d04f7e04ffbc50ec3174 (patch)
tree9e692dbb89e46faaea656af979b6855502481772 /indra/cmake
parentfbf5b199f3bd9775bc992609baf6c093177a70d8 (diff)
parent7ed52090a67882cd0bc904f1e0a9ce07cf6768e9 (diff)
MErge with main after Viewer release
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index a4da822538..ae15e8be34 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -229,6 +229,7 @@ elseif(LINUX)
libfreetype.so.6.6.2
libfreetype.so.6
libhunspell-1.3.so.0.0.0
+ libopenjp2.so
libuuid.so.16
libuuid.so.16.0.22
libfontconfig.so.1.8.0
@@ -304,6 +305,6 @@ if(DARWIN)
# that end up in any of the above SHARED_LIB_STAGING_DIR_MUMBLE
# directories.
add_custom_command( TARGET stage_third_party_libs POST_BUILD
- COMMAND cmake -E create_symlink ${SHARED_LIB_STAGING_DIR} ${CMAKE_BINARY_DIR}/sharedlibs/Resources
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${SHARED_LIB_STAGING_DIR} ${CMAKE_BINARY_DIR}/sharedlibs/Resources
)
endif()