diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-04-18 18:11:43 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-04-18 18:11:43 +0200 |
| commit | 2b151e0aefd54671e1be504269f10318d303dccb (patch) | |
| tree | c1527ef5d23bc946ac8dfcb907d2678a9a96db79 /indra/cmake/ViewerMiscLibs.cmake | |
| parent | dcfb94fbaca3c66ec02e6873cda53b4afd547beb (diff) | |
Round one to support conan for 3P packages, this allows to build the viewer on Linux again.
Diffstat (limited to 'indra/cmake/ViewerMiscLibs.cmake')
| -rw-r--r-- | indra/cmake/ViewerMiscLibs.cmake | 15 |
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) |