GLX fixes

Ref: #689

Author: rodlie

src/cmake/friction-common.cmake

@@ -30,6 +30,7 @@ option(MAC_DEPLOY "Mac Deploy" OFF)
 option(WIN_DEPLOY "Windows Deploy" OFF)
 option(BUILD_SKIA "Build skia" ON)
 option(SKIA_STATIC "Static skia" OFF)
+option(USE_EGL "Use EGL" ON)
 set(SKIA_LIB_PATH "/mnt/skia" CACHE STRING "Path to prebuilt skia library")
 
 if(${LINUX_DEPLOY})
@@ -60,6 +61,15 @@ if(UNIX)
     endif()
 endif()
 
+if(${SKIA_STATIC})
+    if(UNIX AND NOT APPLE)
+        if(NOT OpenGL_GL_PREFERENCE)
+            set(OpenGL_GL_PREFERENCE "GLVND")
+        endif()
+        find_package(OpenGL REQUIRED)
+    endif()
+endif()
+
 if(CMAKE_BUILD_TYPE MATCHES "^(release|Release|RELEASE)$")
     add_definitions(-DQT_NO_DEBUG_OUTPUT)
 else()
@@ -108,7 +118,7 @@ else()
         if(APPLE)
             set(SKIA_LIBRARIES skia z)
         else()
-            set(SKIA_LIBRARIES skia)
+            set(SKIA_LIBRARIES skia ${OPENGL_LIBRARY})
         endif()
     else()
         set(SKIA_LIBRARIES skia-friction)

src/core/CMakeLists.txt

@@ -39,7 +39,6 @@ add_definitions(-DPROJECT_BRANCH="${GIT_BRANCH}")
 add_definitions(-DCORE_LIBRARY)
 
 if(UNIX AND NOT APPLE)
-    option(USE_EGL "Use EGL" ON)
     if(${USE_EGL})
         add_definitions(-DFRICTION_EGL)
     endif()