diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-09 14:18:14 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-09 14:18:14 +0800 |
| commit | 43d43c79d0254b8b27f2386f67335e5f3dc5d24f (patch) | |
| tree | b9063c72fa5f7a0cf8b14f55ce1180130a0ff96e /indra/cmake/ViewerMiscLibs.cmake | |
| parent | b89076f0567547b9c2749595af5ae9d5f9de9f3a (diff) | |
| parent | 7c716d6d516f99628655352a0e679455263924e2 (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/cmake/ViewerMiscLibs.cmake')
| -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) |