From 9bcd3298bad6d007b7f529276a38bd631ce940ba Mon Sep 17 00:00:00 2001 From: Router Gray Date: Sat, 4 May 2019 07:28:50 -0500 Subject: [PATCH] Use dictionaries prebuilt instead of in-tree; adds several languages. --- indra/cmake/Hunspell.cmake | 1 + indra/newview/viewer_manifest.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake index 25b06092b..83f9bc2fd 100644 --- a/indra/cmake/Hunspell.cmake +++ b/indra/cmake/Hunspell.cmake @@ -12,4 +12,5 @@ else (STANDALONE) set(HUNSPELL_LIBRARY libhunspell) endif (LINUX OR DARWIN) set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell) + use_prebuilt_binary(dictionaries) endif (STANDALONE) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7053782ef..4a8698189 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -95,7 +95,8 @@ class ViewerManifest(LLManifest): # ... and the included spell checking dictionaries pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') - self.path("dictionaries") + with self.prefix(src=pkgdir): + self.path("dictionaries") # include the extracted packages information (see BuildPackagesInfo.cmake) self.path(src=os.path.join(self.args['build'],"packages-info.txt"), dst="packages-info.txt")