all repos — mgba @ 1f2ff497e2b9096cf48ecfa1b589fd52c41a5460

mGBA Game Boy Advance Emulator

Revert "Fix CMakeFile.txt for SDL2 supplied SDL2-config.cmake, which is inclu… (#830)"

This reverts commit f5887513fd9ef911ffc556e1bc1ec36ab1308ecf.

Broke too much stuff, didn't fix enough
Vicki Pfau vi@endrift.com
Sat, 29 Jul 2017 14:43:55 -0700
commit

1f2ff497e2b9096cf48ecfa1b589fd52c41a5460

parent

f5887513fd9ef911ffc556e1bc1ec36ab1308ecf

1 files changed, 2 insertions(+), 5 deletions(-)

jump to
M src/platform/sdl/CMakeLists.txt → src/platform/sdl/CMakeLists.txt 
@@ -1,11 +1,8 @@
 set(SDL_VERSION "2" CACHE STRING "Version of SDL to use (1.2 or 2)")
 
 if (SDL_VERSION EQUAL "2")
-	find_package(SDL2)
-	if (NOT SDL2_FOUND)
-		include(FindPkgConfig)
-		pkg_search_module(SDL2 sdl2)
-	endif()
+	include(FindPkgConfig)
+	pkg_search_module(SDL2 sdl2)
 	if (SDL2_FOUND)
 		set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIRS})
 		set(SDL_LIBRARY ${SDL2_LIBRARIES})