From 579d8fbf82b622b6e071cf8fbc5770238644eb85 Mon Sep 17 00:00:00 2001 From: Rye Date: Thu, 23 Oct 2025 02:16:20 -0400 Subject: CMake changes for linux64 support including code from archive/develop Restore changes for GLIB based dbus support from archive/develop Signed-off-by: Rye --- indra/cmake/ViewerMiscLibs.cmake | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'indra/cmake/ViewerMiscLibs.cmake') diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index cae68fbc11..23fd477ba8 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -5,11 +5,8 @@ if (LINUX) #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() + find_package(Fontconfig REQUIRED) + target_link_libraries( ll::fontconfig INTERFACE Fontconfig::Fontconfig ) endif (LINUX) if( NOT USE_CONAN ) -- cgit v1.3