Link to OpenGL::GL

hunter-packages · Jan 4, 2018 · 245e1e2 · 245e1e2
1 parent cf021b6
commit 245e1e2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -888,11 +888,11 @@ elseif(HAIKU)
     endif(SDL_TIMERS)
 
     if(VIDEO_OPENGL)
-      # TODO: Use FIND_PACKAGE(OpenGL) instead
+      find_package(OpenGL REQUIRED)
       set(SDL_VIDEO_OPENGL 1)
       set(SDL_VIDEO_OPENGL_BGL 1)
       set(SDL_VIDEO_RENDER_OGL 1)
-      list(APPEND EXTRA_LIBS GL)
+      list(APPEND EXTRA_LIBS OpenGL::GL)
       set(HAVE_VIDEO_OPENGL TRUE)
     endif()
 

diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
@@ -26,6 +26,10 @@ if("@APPLE@")
   endif()
 endif()
 
+if("@SDL_VIDEO_OPENGL@")
+  find_package(OpenGL REQUIRED)
+endif()
+
 find_package(Threads REQUIRED)
 
 include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")

diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake
@@ -719,7 +719,8 @@ macro(CheckOpenGL)
         set(SDL_VIDEO_OPENGL_GLX 1)
       endif ()
       set(SDL_VIDEO_RENDER_OGL 1)
-      list(APPEND EXTRA_LIBS GL)
+      find_package(OpenGL REQUIRED)
+      list(APPEND EXTRA_LIBS OpenGL::GL)
     endif()
     set (CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS})
   endif()