From 89b2d18e3747f0190bcb3dd5ccb48c7b8d186e48 Mon Sep 17 00:00:00 2001 From: Sylvain Beucler Date: Sun, 13 May 2012 09:08:35 +0000 Subject: [PATCH] Multi-touch: fix CMake: Xi and XInput2.h detection wasn't ported from autoconf, effectively disabling multi-touch git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1315 7f0cb862-5218-0410-a997-914c9d46530a --- CMakeLists.txt | 6 +++++- config.h.in | 1 + src/x11/fg_xinput_x11.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2cf980..2277d70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,6 +207,7 @@ IF(CMAKE_COMPILER_IS_GNUCC) ENDIF() ENDIF(CMAKE_COMPILER_IS_GNUCC) +INCLUDE(CheckIncludeFiles) IF(UNIX AND NOT ANDROID) FIND_PACKAGE(X11 REQUIRED) LIST(APPEND LIBS ${X11_LIBRARIES}) @@ -222,6 +223,10 @@ IF(UNIX AND NOT ANDROID) ENDIF() LIST(APPEND LIBS ${X11_Xxf86vm_LIB}) ENDIF() + IF(X11_Xinput_FOUND) + CHECK_INCLUDE_FILES("${X11_Xinput_INCLUDE_PATH}/X11/extensions/XInput2.h" HAVE_X11_EXTENSIONS_XINPUT2_H) + LIST(APPEND LIBS ${X11_Xinput_LIB}) + ENDIF() ENDIF() IF(ANDROID) # -landroid for ANativeWindow @@ -229,7 +234,6 @@ IF(ANDROID) LIST(APPEND LIBS android log) ENDIF() -INCLUDE(CheckIncludeFiles) INCLUDE(CheckFunctionExists) INCLUDE(CheckTypeSize) CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H) diff --git a/config.h.in b/config.h.in index 462d327..8d7f60d 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,6 @@ #cmakedefine HAVE_X11_EXTENSIONS_XF86VMODE_H #cmakedefine HAVE_X11_EXTENSIONS_XRANDR_H +#cmakedefine HAVE_X11_EXTENSIONS_XINPUT2_H #cmakedefine HAVE_SYS_TYPES_H #cmakedefine HAVE_UNISTD_H #cmakedefine HAVE_SYS_TIME_H diff --git a/src/x11/fg_xinput_x11.c b/src/x11/fg_xinput_x11.c index fac1bf7..ef6e9fb 100644 --- a/src/x11/fg_xinput_x11.c +++ b/src/x11/fg_xinput_x11.c @@ -5,7 +5,7 @@ #include "../fg_internal.h" -#if HAVE_X11_EXTENSIONS_XINPUT2_H +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H #include #include -- 1.7.10.4