From 2418022f1e600fb9492f323b660e2cd3db02f03d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20H=C3=B6ger?= Date: Wed, 4 Jul 2012 14:39:43 +0200 Subject: [PATCH 14/14] Add dbus GLIB dependency --- CMakeLists.txt | 2 +- cmake/FindDBUS.cmake | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83d131a..4d17898 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ target_link_libraries(_dbus_bindings ${PYTHON_LIBRARIES} ${DBUS_LIBRARY}) include_directories(_dbus_glib_bindings/ ${GLIB_INCLUDE_DIR} ${GLIB_CONFIG_INCLUDE_DIR} ${DBUS_INCLUDES}) file(GLOB dbus_glib_binding_sources _dbus_glib_bindings/*.c) add_library(_dbus_glib_bindings SHARED ${dbus_glib_binding_sources}) -target_link_libraries(_dbus_glib_bindings ${PYTHON_LIBRARIES} ${DBUS_LIBRARY} ${GLIB_LIBRARIES}) +target_link_libraries(_dbus_glib_bindings ${PYTHON_LIBRARIES} ${DBUS_LIBRARY} ${DBUS_GLIB_LIBRARY} ${GLIB_LIBRARIES}) file(GLOB dbus_py_test_sources test/*.c) add_library(dbus_py_test SHARED ${dbus_py_test_sources}) diff --git a/cmake/FindDBUS.cmake b/cmake/FindDBUS.cmake index 96e0305..eabb70b 100644 --- a/cmake/FindDBUS.cmake +++ b/cmake/FindDBUS.cmake @@ -1,16 +1,25 @@ FIND_PATH( DBUS_INCLUDE_DIR dbus/dbus.h PATHS ${CMAKE_INCLUDE_PATH}/dbus-1.0 /usr/include/dbus-1.0) FIND_PATH( DBUS_INCLUDE_LIB_DIR dbus/dbus-arch-deps.h PATHS ${CMAKE_LIBRARY_PATH}/dbus-1.0/include /usr/lib/dbus-1.0/include /usr/lib64/dbus-1.0/include) +FIND_PATH( DBUS_GLIB_INCLUDE_DIR dbus/dbus-glib.h PATHS ${CMAKE_INCLUDE_PATH}) FIND_LIBRARY(DBUS_LIBRARY NAME dbus-1 PATHS /lib) -FIND_LIBRARY(DBUS_GLIB_LIBRARY NAME dbus-glib-1 PATHS /lib) +FIND_LIBRARY(DBUS_GLIB_LIBRARY NAME dbus-glib PATHS /lib) -IF( DBUS_INCLUDE_DIR AND DBUS_INCLUDE_LIB_DIR AND DBUS_LIBRARY ) +IF(NOT DBUS_GLIB_INCLUDE_DIR) + MESSAGE(ERROR "Could not find dbus/dbus-glib.h") +ENDIF(NOT DBUS_GLIB_INCLUDE_DIR) + +IF(NOT DBUS_GLIB_LIBRARY) + MESSAGE(ERROR "Could not find lib dbus-glib-1") +ENDIF(NOT DBUS_GLIB_LIBRARY) + +IF( DBUS_INCLUDE_DIR AND DBUS_INCLUDE_LIB_DIR AND DBUS_GLIB_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_GLIB_LIBRARY ) SET( DBUS_FOUND TRUE ) -ENDIF( DBUS_INCLUDE_DIR AND DBUS_INCLUDE_LIB_DIR AND DBUS_LIBRARY ) +ENDIF( DBUS_INCLUDE_DIR AND DBUS_INCLUDE_LIB_DIR AND DBUS_GLIB_INCLUDE_DIR AND DBUS_LIBRARY AND DBUS_GLIB_LIBRARY ) -IF( DBUS_INCLUDE_DIR AND DBUS_INCLUDE_LIB_DIR ) -SET( DBUS_INCLUDES ${DBUS_INCLUDE_DIR} ${DBUS_INCLUDE_LIB_DIR} ) -ENDIF( DBUS_INCLUDE_DIR AND DBUS_INCLUDE_LIB_DIR ) +IF( DBUS_INCLUDE_DIR AND DBUS_INCLUDE_LIB_DIR AND DBUS_GLIB_INCLUDE_DIR) +SET( DBUS_INCLUDES ${DBUS_INCLUDE_DIR} ${DBUS_INCLUDE_LIB_DIR} ${DBUS_GLIB_INCLUDE_DIR}) +ENDIF( DBUS_INCLUDE_DIR AND DBUS_INCLUDE_LIB_DIR AND DBUS_GLIB_INCLUDE_DIR) IF( DBUS_FOUND ) MESSAGE( STATUS "Found dbus: ${DBUS_LIBRARY}" ) -- 1.7.10