diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-10 15:14:11 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-10 15:14:11 +0800 |
| commit | 8c21d1177314c61c7e555d56ae4994f51003ee64 (patch) | |
| tree | c5bef3ca720cbd1dbcc570c78b34f34aca57d305 | |
| parent | 19fbbf07ab8d17f6f94e1a3e58783562324b894f (diff) | |
| parent | c7234a4ad05bc384ec0bb54eacd428e615b438cc (diff) | |
Merge branch 'main' into 2024.09-ExtraFPS
| -rw-r--r-- | indra/cmake/Hunspell.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake index 5fa22120e6..129679febd 100644 --- a/indra/cmake/Hunspell.cmake +++ b/indra/cmake/Hunspell.cmake @@ -3,9 +3,7 @@ include(Linking) include(Prebuilt) include_guard() -if (USE_AUTOBUILD_3P OR USE_CONAN) use_prebuilt_binary(dictionaries) -endif () add_library( ll::hunspell INTERFACE IMPORTED ) use_system_binary(hunspell) diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index ab52c63a91..6080dd512e 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -59,6 +59,11 @@ if (DARWIN) DESTINATION app_settings ) + install(DIRECTORY + ${AUTOBUILD_INSTALL_DIR}/dictionaries + DESTINATION app_settings + ) + if (NDOF) install(FILES "${AUTOBUILD_INSTALL_DIR}/lib/release/libndofdev.dylib" @@ -146,6 +151,11 @@ install(FILES ${SCRIPTS_DIR}/messages/message_template.msg DESTINATION share/${VIEWER_BINARY_NAME}/app_settings ) + install(DIRECTORY + ${AUTOBUILD_INSTALL_DIR}/dictionaries + DESTINATION share/${VIEWER_BINARY_NAME}/app_settings + ) + install(FILES linux_tools/${VIEWER_BINARY_NAME}.desktop DESTINATION share/applications ) |