[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Oxygen-Gtk] 00d7a90: Added check on dbus-glib.
From:       Hugo Pereira Da Costa <hugo () oxygen-icons ! org>
Date:       2011-01-08 13:53:59
Message-ID: 20110108135359.565B8A6090 () git ! kde ! org
[Download RAW message or body]

commit 00d7a90ce31e7831ebf70b9d4ddca7745b4c68cf
branch master
Author: Hugo Pereira Da Costa <hugo@oxygen-icons.org>
Date:   Fri Jan 7 19:06:22 2011 +0100

    Added check on dbus-glib.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd42fad..acf8c34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,9 @@ pkg_check_modules( GTK REQUIRED gtk+-2.0 )
 # Cairo
 pkg_check_modules( CAIRO REQUIRED cairo )
 
+# DBus
+pkg_check_modules( DBUS dbus-glib-1 )
+
 ##########################
 # installation directories
 ##########################
@@ -83,8 +86,8 @@ message( STATUS "Installing the GTK theme engine data to: \
${GTK_THEME_DIR}" )  \
######################################################################  # Setup \
definitions and directories to be used for linking and include  \
                ######################################################################
                
-link_directories( ${GTK_LIBRARY_DIRS} ${CAIRO_LIBRARY_DIRS} )
-include_directories( ${GTK_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRD} \
${X11_X11_INCLUDE_PATH} ) +link_directories( ${GTK_LIBRARY_DIRS} \
${CAIRO_LIBRARY_DIRS} ${DBUS_LIBRARY_DIRS} ) +include_directories( \
${GTK_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRD} ${DBUS_INCLUDE_DIRS} \
${X11_X11_INCLUDE_PATH} )  
 #############################
 # generate configuration file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 13cd56b..f60b4ca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,6 +54,6 @@ add_library( oxygen-gtk SHARED ${OXYGEN-GTK-SOURCES} )
 set( CMAKE_CXX_FLAGS " -Wall ${CMAKE_CXX_FLAGS} -g" )
 set( CMAKE_C_FLAGS " -Wall ${CMAKE_C_FLAGS} -g" )
 
-target_link_libraries( oxygen-gtk ${GTK_LIBRARIES} ${CAIRO_LIBRARIES} ${X11_X11_LIB} \
) +target_link_libraries( oxygen-gtk ${GTK_LIBRARIES} ${CAIRO_LIBRARIES} \
${DBUS_LIBRARIES} ${X11_X11_LIB} )  
 install( TARGETS oxygen-gtk DESTINATION ${INSTALL_PATH_GTK_ENGINES} )


[prev in list] [next in list] [prev in thread] [next in thread]