summaryrefslogtreecommitdiff
path: root/indra/cmake/ViewerMiscLibs.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'indra/cmake/ViewerMiscLibs.cmake')
-rw-r--r--indra/cmake/ViewerMiscLibs.cmake15
1 files changed, 12 insertions, 3 deletions
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 7b5c990094..00f8b77106 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -2,10 +2,19 @@
include(Prebuilt)
if (LINUX)
- use_prebuilt_binary(libuuid)
- use_prebuilt_binary(fontconfig)
+ #use_prebuilt_binary(libuuid)
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)
-use_prebuilt_binary(libhunspell)
+
+if( NOT USE_CONAN )
+ use_prebuilt_binary(libhunspell)
+endif()
+
use_prebuilt_binary(slvoice)