From 37c142581271b1a70288c3b92fd863c18eae4f32 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 8 Aug 2020 18:55:35 -0400
Subject: [PATCH] Use system freetype and fontconfig on linux builds
---
indra/cmake/FreeType.cmake | 7 ++++---
indra/cmake/ViewerManager.cmake | 5 +++--
indra/cmake/ViewerMiscLibs.cmake | 1 -
indra/llwindow/CMakeLists.txt | 3 +--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
index a36485f6d0f..689b49e2b9a 100644
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -1,14 +1,15 @@
# -*- cmake -*-
include(Prebuilt)
-if (USESYSTEMLIBS)
+if (LINUX OR USESYSTEMLIBS)
include(FindPkgConfig)
pkg_check_modules(FREETYPE REQUIRED freetype2)
-else (USESYSTEMLIBS)
+ pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
+else ()
use_prebuilt_binary(freetype)
set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/freetype2/)
set(FREETYPE_LIBRARIES freetype)
-endif (USESYSTEMLIBS)
+endif ()
link_directories(${FREETYPE_LIBRARY_DIRS})
diff --git a/indra/cmake/ViewerManager.cmake b/indra/cmake/ViewerManager.cmake
index 7150ffc4d17..77cac3a1877 100644
--- a/indra/cmake/ViewerManager.cmake
+++ b/indra/cmake/ViewerManager.cmake
@@ -1,3 +1,4 @@
include (Prebuilt)
-use_prebuilt_binary(viewer-manager)
-
+if(NOT LINUX)
+ use_prebuilt_binary(viewer-manager)
+endif()
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index fc5bdedb5af..beba41362dc 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -4,7 +4,6 @@ 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)
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 7ac49a80ed1..ae56f73e2be 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -73,11 +73,10 @@ if (LINUX)
${LLMATH_LIBRARIES}
${LLRENDER_LIBRARIES}
${LLVFS_LIBRARIES}
- ${LLWINDOW_LIBRARIES}
${LLXML_LIBRARIES}
${UI_LIBRARIES} # for GTK
${SDL_LIBRARY}
- fontconfig # For FCInit and other FC* functions.
+ ${FONTCONFIG_LIBRARIES} # For FCInit and other FC* functions.
)
list(APPEND viewer_SOURCE_FILES
--
GitLab