System wide Xinerama is needed by the current gtk from LL>

2015-05-06 18:03:31 +02:00 · 2015-05-06 18:03:31 +02:00 · 803e7a2571
parent 217e879c20
commit 803e7a2571
2 changed files with 4 additions and 4 deletions
--- 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 (
--- 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)