diff options
Diffstat (limited to 'indra/cmake/ViewerMiscLibs.cmake')
| -rw-r--r-- | indra/cmake/ViewerMiscLibs.cmake | 16 | 
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index cae68fbc11..af13746c91 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -1,23 +1,23 @@  # -*- cmake -*-  include(Prebuilt) -if (LINUX) -  #use_prebuilt_binary(libuuid) +if (NOT (DARWIN OR WINDOWS))    add_library( ll::fontconfig INTERFACE IMPORTED ) -  if( NOT USE_CONAN ) -    use_prebuilt_binary(fontconfig) -  else() -    target_link_libraries( ll::fontconfig INTERFACE CONAN_PKG::fontconfig ) -  endif() -endif (LINUX) +  find_package(Fontconfig REQUIRED) +  target_link_libraries( ll::fontconfig INTERFACE  Fontconfig::Fontconfig ) +endif () +if (FALSE)  if( NOT USE_CONAN )    use_prebuilt_binary(libhunspell)  endif()  use_prebuilt_binary(slvoice) +endif (FALSE) +if (${LINUX_DISTRO} MATCHES debian AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 OR DARWIN)  use_prebuilt_binary(nanosvg) +endif ()  use_prebuilt_binary(viewer-fonts)  use_prebuilt_binary(emoji_shortcodes)  | 
