diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-29 12:35:27 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-29 12:35:27 +0800 |
| commit | d046d7e0e1e3ccbffb42d22fe52aa73d0c170b8e (patch) | |
| tree | 7c2023e55955c9aed55db9331bae164a386a2d21 /indra/cmake/ViewerMiscLibs.cmake | |
| parent | 6641e36082f27faa282a0af6f88f381ffc97e179 (diff) | |
| parent | 11d75418fce8372e9976b069070d9d0506766d0d (diff) | |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/cmake/ViewerMiscLibs.cmake')
| -rw-r--r-- | indra/cmake/ViewerMiscLibs.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 13f5ebf862..4ab69e30aa 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -1,23 +1,23 @@ # -*- cmake -*- include(Prebuilt) -if (NOT (WINDOWS OR DARWIN)) +if (NOT (DARWIN OR WINDOWS)) add_library( ll::fontconfig INTERFACE IMPORTED ) find_package(Fontconfig REQUIRED) target_link_libraries( ll::fontconfig INTERFACE Fontconfig::Fontconfig ) -endif (NOT (WINDOWS OR DARWIN)) +endif () -if( USE_AUTOBUILD_3P ) +if (FALSE) +if( NOT USE_CONAN ) use_prebuilt_binary(libhunspell) endif() -if (NOT USESYSTEMLIBS) use_prebuilt_binary(slvoice) -endif (NOT USESYSTEMLIBS) +endif (FALSE) -if ((${LINUX_DISTRO} MATCHES debian OR WINDOWS OR DARWIN) OR NOT USESYSTEMLIBS) +if (${LINUX_DISTRO} MATCHES debian OR DARWIN OR WINDOWS) use_prebuilt_binary(nanosvg) -endif ((${LINUX_DISTRO} MATCHES debian OR WINDOWS OR DARWIN) OR NOT USESYSTEMLIBS) +endif () use_prebuilt_binary(viewer-fonts) use_prebuilt_binary(emoji_shortcodes) |