livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-13896: Make sure to use our libpangocairo when building on 64-bit Linux.

Tonya Souther 2014-05-30 01:05:52 -05:00
parent 83f1dcf45f
commit 238eced6ea
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/cmake/UI.cmake
View File

@ -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)