diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/NDOF.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake index b88fbccf2a..aa0f0d042c 100644 --- a/indra/cmake/NDOF.cmake +++ b/indra/cmake/NDOF.cmake @@ -7,11 +7,13 @@ include_guard() add_library( ll::ndof INTERFACE IMPORTED ) if (NDOF) + if (NOT USESYSTEMLIBS) if (WINDOWS OR DARWIN) use_prebuilt_binary(libndofdev) elseif (LINUX) use_prebuilt_binary(open-libndofdev) endif (WINDOWS OR DARWIN) + endif (NOT USESYSTEMLIBS) if (WINDOWS) target_link_libraries( ll::ndof INTERFACE libndofdev) diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index b6f5569061..b6e670d09b 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -59,6 +59,13 @@ if (DARWIN) DESTINATION Resources/SLPlugin.app/Contents/Frameworks ) + if (NDOF) + install(FILES + "${AUTOBUILD_INSTALL_DIR}/lib/release/libndofdev.dylib" + DESTINATION Resources + ) + endif () + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/FixBundle.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake |