From d3521b4462195cfe882b2cc8eb4e7c5e948c0fb6 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 13 Apr 2022 10:28:46 +0200 Subject: Remove obsolete and unmaintained USE_SYSTEMLIBS --- indra/cmake/ViewerMiscLibs.cmake | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'indra/cmake/ViewerMiscLibs.cmake') diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index fc5bdedb5a..1dff854855 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -1,12 +1,10 @@ # -*- cmake -*- include(Prebuilt) -if (NOT USESYSTEMLIBS) - if (LINUX) - use_prebuilt_binary(libuuid) - use_prebuilt_binary(fontconfig) - endif (LINUX) - use_prebuilt_binary(libhunspell) - use_prebuilt_binary(slvoice) -endif(NOT USESYSTEMLIBS) +if (LINUX) + use_prebuilt_binary(libuuid) + use_prebuilt_binary(fontconfig) +endif (LINUX) +use_prebuilt_binary(libhunspell) +use_prebuilt_binary(slvoice) -- cgit v1.2.3 From a9f4e88a30ada36b098f0d43e7a652ab4df7a0d9 Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 18 Apr 2022 03:10:54 +0200 Subject: Introduce ll::fontconfig target (missing the correct link library, but at least this gets us compiling) --- indra/cmake/ViewerMiscLibs.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/cmake/ViewerMiscLibs.cmake') diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 1dff854855..7b5c990094 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -4,6 +4,7 @@ include(Prebuilt) if (LINUX) use_prebuilt_binary(libuuid) use_prebuilt_binary(fontconfig) + add_library( ll::fontconfig INTERFACE IMPORTED ) endif (LINUX) use_prebuilt_binary(libhunspell) use_prebuilt_binary(slvoice) -- cgit v1.2.3 From 2b151e0aefd54671e1be504269f10318d303dccb Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 18 Apr 2022 18:11:43 +0200 Subject: Round one to support conan for 3P packages, this allows to build the viewer on Linux again. --- indra/cmake/ViewerMiscLibs.cmake | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'indra/cmake/ViewerMiscLibs.cmake') 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) -- cgit v1.2.3