We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

diff of CMakeLists.txt and include/SDL_config.h.cmake

patch_ibus_support.diff (text/plain), 1.21 KB, created by joe.gsoc16 on 2016-03-31 01:07:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe.gsoc16

Created: 2016-03-31 01:07:22 UTC

Size: 1.21 KB

patch

obsolete

>diff -r eba8155e32b1 CMakeLists.txt
>--- a/CMakeLists.txt	Mon Mar 28 21:03:04 2016 +0200
>+++ b/CMakeLists.txt	Thu Mar 31 01:12:15 2016 +0200
>@@ -889,8 +889,22 @@
> 
>     check_include_file("libudev.h" HAVE_LIBUDEV_H)
> 
>-    # !!! FIXME: this needs pkg-config to find the include path, I think.
>-    check_include_file("dbus/dbus.h" HAVE_DBUS_DBUS_H)
>+    if(PKG_CONFIG_FOUND)
>+      pkg_search_module(DBUS dbus-1 dbus)
>+      if(DBUS_FOUND)
>+        set(HAVE_DBUS_DBUS_H TRUE)
>+        include_directories(${DBUS_INCLUDE_DIRS})
>+        list(APPEND EXTRA_LIBS ${DBUS_LIBRARIES})
>+      endif()
>+
>+      pkg_search_module(IBUS ibus-1.0 ibus)
>+      if(IBUS_FOUND)
>+        set(HAVE_IBUS_IBUS_H TRUE)
>+        include_directories(${IBUS_INCLUDE_DIRS})
>+        list(APPEND EXTRA_LIBS ${IBUS_LIBRARIES})
>+      endif()
>+    endif()
>+
>   endif()
> 
>   if(INPUT_TSLIB)
>diff -r eba8155e32b1 include/SDL_config.h.cmake
>--- a/include/SDL_config.h.cmake	Mon Mar 28 21:03:04 2016 +0200
>+++ b/include/SDL_config.h.cmake	Thu Mar 31 01:12:15 2016 +0200
>@@ -81,6 +81,7 @@
> #cmakedefine HAVE_PTHREAD_NP_H 1
> #cmakedefine HAVE_LIBUDEV_H 1
> #cmakedefine HAVE_DBUS_DBUS_H 1
>+#cmakedefine HAVE_IBUS_IBUS_H 1
> 
> /* C library functions */
> #cmakedefine HAVE_MALLOC 1

Actions: View

Attachments on bug 3301: 2402

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.