diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-08 17:43:37 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-08 17:43:37 +0800 |
| commit | 4ccc3db9033a039aaa618db85126e669e08ac4c7 (patch) | |
| tree | c8fe140de19838dc91d3cb8de77cfccfe27f061d /indra | |
| parent | 98f2f92469351447e69f9368d42a7e6f6c3a4da0 (diff) | |
Automate viewer fonts & emoji shortcodes install
Also minimise ViewerMiscLibs.cmake diff from upstream.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/ViewerMiscLibs.cmake | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 7de21fd59b..fad95beae8 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -1,24 +1,22 @@ # -*- cmake -*- include(Prebuilt) -if (NOT (USE_AUTOBUILD_3P OR USE_CONAN)) - add_library( ll::fontconfig INTERFACE IMPORTED ) - use_system_binary(fontconfig) -endif () - -if (LINUX) +if (NOT DARWIN) add_library( ll::fontconfig INTERFACE IMPORTED ) find_package(Fontconfig REQUIRED) target_link_libraries( ll::fontconfig INTERFACE Fontconfig::Fontconfig ) -endif (LINUX) +endif (NOT DARWIN) -if( NOT USE_CONAN ) +if( USE_AUTOBUILD_3P ) use_prebuilt_binary(libhunspell) endif() +if (NOT USESYSTEMLIBS) use_prebuilt_binary(slvoice) use_prebuilt_binary(nanosvg) +endif (NOT USESYSTEMLIBS) + use_prebuilt_binary(viewer-fonts) use_prebuilt_binary(emoji_shortcodes) |