From f3502c3c5385e1bd2d32a2d955382d7013528408 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 14 Oct 2016 01:04:21 -0700 Subject: [PATCH] Fixed building with cmake when fcitx isn't installed --- CMakeLists.txt | 2 ++ include/SDL_config.h.cmake | 1 + src/core/linux/SDL_fcitx.c | 5 +++++ 3 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9038abfc0..54a23f0c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -916,6 +916,8 @@ elseif(UNIX AND NOT APPLE) endif() endif() + check_include_file("fcitx/frontend.h" HAVE_FCITX_FRONTEND_H) + endif() if(INPUT_TSLIB) diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake index 57a44b902..98c62a994 100644 --- a/include/SDL_config.h.cmake +++ b/include/SDL_config.h.cmake @@ -82,6 +82,7 @@ #cmakedefine HAVE_LIBUDEV_H 1 #cmakedefine HAVE_DBUS_DBUS_H 1 #cmakedefine HAVE_IBUS_IBUS_H 1 +#cmakedefine HAVE_FCITX_FRONTEND_H 1 /* C library functions */ #cmakedefine HAVE_MALLOC 1 diff --git a/src/core/linux/SDL_fcitx.c b/src/core/linux/SDL_fcitx.c index 05361fff2..eff8f7f39 100644 --- a/src/core/linux/SDL_fcitx.c +++ b/src/core/linux/SDL_fcitx.c @@ -18,6 +18,9 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ +#include "SDL_config.h" + +#ifdef HAVE_FCITX_FRONTEND_H #include #include @@ -545,4 +548,6 @@ SDL_Fcitx_PumpEvents() } } +#endif /* HAVE_FCITX_FRONTEND_H */ + /* vi: set ts=4 sw=4 expandtab: */