summaryrefslogtreecommitdiffstats
path: root/CMakeScripts/DefineDependsandFlags.cmake
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2016-04-16 14:39:29 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2016-04-16 14:39:29 +0000
commiteeed7483385d14192bb11ef501bc729c286da7c5 (patch)
treef59a70eb69105145d10f6b1898bd6f32a76e987c /CMakeScripts/DefineDependsandFlags.cmake
parentCMake: Disable broken pseudo-option for GTKSPELL - determined automatically b... (diff)
downloadinkscape-eeed7483385d14192bb11ef501bc729c286da7c5.tar.gz
inkscape-eeed7483385d14192bb11ef501bc729c286da7c5.zip
CMake build: builds with WITH_DBUS
(bzr r14853)
Diffstat (limited to 'CMakeScripts/DefineDependsandFlags.cmake')
-rw-r--r--CMakeScripts/DefineDependsandFlags.cmake10
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 204f96c02..8e1cf2826 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -183,11 +183,13 @@ else(POTRACE_FOUND)
endif()
if(WITH_DBUS)
- find_package(DBus REQUIRED)
+ pkg_check_modules(DBUS dbus-1 dbus-glib-1)
if(DBUS_FOUND)
- list(APPEND INKSCAPE_INCS_SYS ${DBUS_INCLUDE_DIR})
- list(APPEND INKSCAPE_INCS_SYS ${DBUS_ARCH_INCLUDE_DIR})
- list(APPEND INKSCAPE_LIBS ${DBUS_LIBRARIES})
+ list(APPEND INKSCAPE_LIBS ${DBUS_LDFLAGS})
+ list(APPEND INKSCAPE_INCS_SYS ${DBUS_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/src/extension/dbus/)
+ list(APPEND INKSCAPE_LIBS ${DBUS_LIBRARIES})
+ add_definitions(${DBUS_CFLAGS_OTHER})
+
else()
set(WITH_DBUS OFF)
endif()