summaryrefslogtreecommitdiff
path: root/indra/cmake/ViewerMiscLibs.cmake
diff options
context:
space:
mode:
authorSignal Linden <signal@lindenlab.com>2023-04-10 10:54:13 -0700
committerGitHub <noreply@github.com>2023-04-10 10:54:13 -0700
commit53d4e69c514374622afb93f81067aaeec64a443b (patch)
treea327a68d2f1f351275539d65fc7237cbdc29c577 /indra/cmake/ViewerMiscLibs.cmake
parent4042ed9701fcfa42c03fc285a757aa348f800e33 (diff)
parentff0edab69a1dc4884b7636c2546327901ce8fdde (diff)
Merge pull request #159 from secondlife/marchcat/main-contrib-merge
merge main into contribute
Diffstat (limited to 'indra/cmake/ViewerMiscLibs.cmake')
-rw-r--r--indra/cmake/ViewerMiscLibs.cmake20
1 files changed, 14 insertions, 6 deletions
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index fc5bdedb5a..00f8b77106 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -1,12 +1,20 @@
# -*- cmake -*-
include(Prebuilt)
-if (NOT USESYSTEMLIBS)
- if (LINUX)
- use_prebuilt_binary(libuuid)
+if (LINUX)
+ #use_prebuilt_binary(libuuid)
+ add_library( ll::fontconfig INTERFACE IMPORTED )
+
+ if( NOT USE_CONAN )
use_prebuilt_binary(fontconfig)
- endif (LINUX)
+ else()
+ target_link_libraries( ll::fontconfig INTERFACE CONAN_PKG::fontconfig )
+ endif()
+endif (LINUX)
+
+if( NOT USE_CONAN )
use_prebuilt_binary(libhunspell)
- use_prebuilt_binary(slvoice)
-endif(NOT USESYSTEMLIBS)
+endif()
+
+use_prebuilt_binary(slvoice)