From 803e7a2571aeb2449fc890aa308662dd52c276a2 Mon Sep 17 00:00:00 2001 From: Nicky Date: Wed, 6 May 2015 18:03:31 +0200 Subject: [PATCH] System wide Xinerama is needed by the current gtk from LL> --- indra/cmake/UI.cmake | 2 +- indra/newview/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index 49ccf0dbaf..681f6e6116 100755 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -71,7 +71,7 @@ else (USESYSTEMLIBS) set(UI_LIBRARIES ${UI_LIBRARIES} ${UI_LIB_${libname}}) endforeach(libname) -# set(UI_LIBRARIES ${UI_LIBRARIES} Xinerama) + set(UI_LIBRARIES ${UI_LIBRARIES} Xinerama) endif (LINUX) include_directories ( diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index c3fcbe7aa7..c174900347 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1676,9 +1676,9 @@ if (LINUX) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") -# set(viewer_LIBRARIES -# Xinerama -# ) + set(viewer_LIBRARIES + Xinerama + ) if (OPENAL) LIST(APPEND viewer_LIBRARIES ${OPENAL_LIBRARIES}) endif (OPENAL)