From 87d26d39f9758d53b5677b6fc71cdd3ea679ecea Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 13 Jun 2015 03:01:43 -0700
Subject: [PATCH] All: Clean up OpenGL detection

---
 CMakeLists.txt                  | 11 +++++++++++
 src/platform/qt/CMakeLists.txt  |  1 -
 src/platform/sdl/CMakeLists.txt |  5 -----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a91fb8967..d8e793c3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ set(BUILD_LIBRETRO OFF CACHE BOOL "Build libretro core")
 set(BUILD_PERF OFF CACHE BOOL "Build performance profiling tool")
 set(BUILD_STATIC OFF CACHE BOOL "Build a static library")
 set(BUILD_SHARED ON CACHE BOOL "Build a shared library")
+set(BUILD_GL ON CACHE STRING "Build with OpenGL")
 file(GLOB ARM_SRC ${CMAKE_SOURCE_DIR}/src/arm/*.c)
 file(GLOB GBA_SRC ${CMAKE_SOURCE_DIR}/src/gba/*.c)
 file(GLOB GBA_CHEATS_SRC ${CMAKE_SOURCE_DIR}/src/gba/cheats/*.c)
@@ -147,6 +148,12 @@ if(CMAKE_SYSTEM_NAME MATCHES .*BSD)
 else()
 	find_feature(USE_CLI_DEBUGGER "libedit")
 endif()
+if(BUILD_GL)
+	find_package(OpenGL QUIET)
+	if(NOT OPENGL_FOUND)
+		set(BUILD_GL OFF)
+	endif()
+endif()
 find_feature(USE_FFMPEG "libavcodec;libavformat;libavresample;libavutil;libswscale")
 find_feature(USE_PNG "ZLIB;PNG")
 find_feature(USE_LIBZIP "libzip")
@@ -399,6 +406,10 @@ if(UNIX AND NOT APPLE)
 endif()
 set_target_properties(${BINARY_NAME} PROPERTIES VERSION ${LIB_VERSION_STRING} SOVERSION ${LIB_VERSION_ABI} COMPILE_DEFINITIONS "${FEATURE_DEFINES}")
 
+if(BUILD_GL)
+	add_definitions(-DBUILD_GL)
+endif()
+
 if(BUILD_LIBRETRO)
 	file(GLOB RETRO_SRC ${CMAKE_SOURCE_DIR}/src/platform/libretro/*.c)
 	add_library(${BINARY_NAME}_libretro SHARED ${CORE_SRC} ${RETRO_SRC})
diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt
index 577a343b1..33ff03ec8 100644
--- a/src/platform/qt/CMakeLists.txt
+++ b/src/platform/qt/CMakeLists.txt
@@ -31,7 +31,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 find_package(Qt5Multimedia)
 find_package(Qt5OpenGL)
 find_package(Qt5Widgets)
-find_package(OpenGL)
 
 if(NOT Qt5OpenGL_FOUND OR NOT Qt5Widgets_FOUND OR NOT OPENGL_FOUND)
 	message(WARNING "Cannot find Qt modules")
diff --git a/src/platform/sdl/CMakeLists.txt b/src/platform/sdl/CMakeLists.txt
index eeb1d8374..94ba32492 100644
--- a/src/platform/sdl/CMakeLists.txt
+++ b/src/platform/sdl/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(SDL_VERSION "2" CACHE STRING "Version of SDL to use (1.2 or 2)")
-set(BUILD_GL ON CACHE STRING "Build with OpenGL")
 
 if (SDL_VERSION EQUAL "2")
 	include(FindPkgConfig)
@@ -66,12 +65,8 @@ if(BUILD_PANDORA)
 else()
 	list(APPEND MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/sw-sdl.c)
 	if(BUILD_GL)
-		find_package(OpenGL)
-	endif()
-	if(OPENGL_FOUND)
 		list(APPEND MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/gl-sdl.c)
 		list(APPEND PLATFORM_SRC ${CMAKE_SOURCE_DIR}/src/platform/opengl/gl.c)
-		add_definitions(-DBUILD_GL)
 		include_directories(${OPENGL_INCLUDE_DIR})
 	endif()
 endif()