From 238eced6eac7e07fcb770a0ff90e8b78a0c6bf97 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Fri, 30 May 2014 01:05:52 -0500
Subject: [PATCH] FIRE-13896: Make sure to use our libpangocairo when building
 on 64-bit Linux.

---
 indra/cmake/UI.cmake | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 3a476c4c0d..e7897746aa 100755
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -49,6 +49,14 @@ else (STANDALONE)
         pangox-1.0
         pangoxft-1.0
         )
+
+    if (ND_BUILD64BIT_ARCH)
+      set(UI_LIB_NAMES ${UI_LIB_NAMES}
+          gio-2.0
+          pangocairo-1.0
+          )
+    endif(ND_BUILD64BIT_ARCH)
+
     foreach(libname ${UI_LIB_NAMES})
       find_library(UI_LIB_${libname}
                    NAMES ${libname}
@@ -60,17 +68,6 @@ else (STANDALONE)
       set(UI_LIBRARIES ${UI_LIBRARIES} ${UI_LIB_${libname}})
     endforeach(libname)
 
-    if (ND_BUILD64BIT_ARCH)
-      find_library(UI_LIB_gio-2.0
-                   NAMES gio-2.0
-                   PATHS
-                     debug ${LIBS_PREBUILT_DIR}/lib/debug
-                     optimized ${LIBS_PREBUILT_DIR}/lib/release
-                   NO_DEFAULT_PATH
-                   )
-      set(UI_LIBRARIES ${UI_LIBRARIES} ${UI_LIB_gio-2.0})
-    endif(ND_BUILD64BIT_ARCH)
-
     set(UI_LIBRARIES ${UI_LIBRARIES} Xinerama)
   endif (LINUX)