Fixed bug 4354 - CMake builds do not correctly enable IME on Linux
Callum McGing
While the CMake build checks for ibus and does enable the ibus backend with set(HAVE_IBUS_IBUS_H TRUE), this does not define SDL_USE_IME, thus CMake built SDL2 (as in Arch Linux) cannot use IME at all.
The attached patch fixes this behaviour when building against ibus. IME support will still fail when only fcitx is available on the build system.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4ed541..14dc89c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1114,6 +1114,7 @@
set(HAVE_IBUS_IBUS_H TRUE)
include_directories(${IBUS_INCLUDE_DIRS})
list(APPEND EXTRA_LIBS ${IBUS_LIBRARIES})
+ add_definitions(-DSDL_USE_IME)
endif()
if(HAVE_LIBUNWIND_H)
# We've already found the header, so REQUIRE the lib to be present
diff --git a/configure b/configure
index a4176da..c56d09a 100755
--- a/configure
+++ b/configure
@@ -22731,7 +22731,7 @@
$as_echo "#define SDL_USE_IME 1" >>confdefs.h
- SOURCES="$SOURCES $srcdir/src/core/linux/SDL_ime.c"
+ SOURCES="$SOURCES $srcdir/src/core/linux/SDL_ime.c"
fi
}
diff --git a/configure.ac b/configure.ac
index 1981702..63350e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2602,7 +2602,7 @@
, enable_ime=yes)
if test x$enable_ime = xyes; then
AC_DEFINE(SDL_USE_IME, 1, [ ])
- SOURCES="$SOURCES $srcdir/src/core/linux/SDL_ime.c"
+ SOURCES="$SOURCES $srcdir/src/core/linux/SDL_ime.c"
fi
}
