Use pkg-config to check for XInput2

dolphin-emu · Jul 21, 2013 · 3239e49 · 3239e49
1 parent fe2fe8b
commit 3239e49
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 33 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -430,12 +430,13 @@ if(NOT ANDROID)
 		else()
 			add_definitions(-DHAVE_XRANDR=0)
 		endif(XRANDR_FOUND)
-		include(FindX11XInput2)
-		if(X11_Xinput2_FOUND)
+
+		pkg_check_modules(XINPUT2 xi>=1.5.0)
+		if(XINPUT2_FOUND)
 			add_definitions(-DHAVE_X11_XINPUT2=1)
 		else()
 			add_definitions(-DHAVE_X11_XINPUT2=0)
-		endif(X11_Xinput2_FOUND)
+		endif(XINPUT2_FOUND)
 	endif()
 	if(ENCODE_FRAMEDUMPS)
 		check_libav()

diff --git a/CMakeTests/FindX11XInput2.cmake b/CMakeTests/FindX11XInput2.cmake