summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2013-08-07 19:20:15 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2013-08-07 19:20:15 -0500
commitc8d64e3c7b8b6da34c3aa9acc2fbac750e122786 (patch)
tree4ec0bb94666d86c00154499e4b003e2cfa6e7aca
parent6f4fd5e5632b2288a483430c625081a51342fdab (diff)
downloadtdelibs-c8d64e3c7b8b6da34c3aa9acc2fbac750e122786.tar.gz
tdelibs-c8d64e3c7b8b6da34c3aa9acc2fbac750e122786.zip
Fix FTBFS on tdehardwaredevices.cpp with some combinations of options.
This resolves bug report 1594.
-rw-r--r--tdecore/CMakeLists.txt27
-rw-r--r--tdecore/tdehardwaredevices.cpp2
2 files changed, 14 insertions, 15 deletions
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index a201774f8..a186c1376 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -19,14 +19,15 @@ if( NOT DBUS_SYSTEM_BUS )
set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE )
endif()
+if( WITH_UPOWER OR WITH_UDISKS OR WITH_UDISKS2 OR
+ WITH_NETWORK_MANAGER_BACKEND OR WITH_CONSOLEKIT )
+ list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS ${DBUS_TQT_INCLUDE_DIRS} )
+ list( APPEND TDEHW_CUSTOM_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} )
+ list( APPEND TDEHW_CUSTOM_LIBRARIES ${DBUS_TQT_LIBRARIES} )
+endif( )
+
if( WITH_UPOWER )
add_definitions( -DWITH_UPOWER )
- set ( TDEUPOWER_INCLUDE_DIRECTORIES
- ${DBUS_TQT_INCLUDE_DIRS}
- )
- set ( TDEUPOWER_LIBRARIES
- ${DBUS_TQT_LIBRARIES}
- )
endif( )
if( WITH_UDISKS )
@@ -48,14 +49,12 @@ endif( WITH_LIBART )
if( WITH_NETWORK_MANAGER_BACKEND )
add_subdirectory( networkbackends/network-manager/dbus )
- set ( TDENM_INCLUDE_DIRECTORIES
- ${DBUS_TQT_INCLUDE_DIRS}
+ list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS
${NM_UTIL_INCLUDE_DIRS}
- "${CMAKE_BINARY_DIR}/tdecore/networkbackends/network-manager/dbus"
+ "${CMAKE_CURRENT_BINARY_DIR}/networkbackends/network-manager/dbus"
)
- set ( TDENM_LIBRARIES
+ list( APPEND TDEHW_CUSTOM_LIBRARIES
tdenm_dbus-static
- ${DBUS_TQT_LIBRARIES}
)
set ( TDENM_BACKEND_SOURCES networkbackends/network-manager/network-manager.cpp )
endif( WITH_NETWORK_MANAGER_BACKEND )
@@ -75,8 +74,7 @@ include_directories(
${LIBART_INCLUDE_DIRS}
${LIBIDN_INCLUDE_DIRS}
${GAMIN_INCLUDEDIR}
- ${TDENM_INCLUDE_DIRECTORIES}
- ${TDEUPOWER_INCLUDE_DIRECTORIES}
+ ${TDEHW_CUSTOM_INCLUDE_DIRS}
)
link_directories(
@@ -84,6 +82,7 @@ link_directories(
${LIBIDN_LIBRARY_DIRS}
${GAMIN_LIBDIR}
${LIBART_LIBRARY_DIRS}
+ ${TDEHW_CUSTOM_LIBRARY_DIRS}
)
##### headers ###################################
@@ -178,7 +177,7 @@ tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 4.2.0
EMBED tdecorenetwork-static
- LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM udev ${GAMIN_LIBRARIES} ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES}
+ LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM udev ${GAMIN_LIBRARIES} ${TDEHW_CUSTOM_LIBRARIES}
DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp
index f75df6e87..bc56f8430 100644
--- a/tdecore/tdehardwaredevices.cpp
+++ b/tdecore/tdehardwaredevices.cpp
@@ -70,7 +70,7 @@ extern "C" {
#endif // WITH_NETWORK_MANAGER_BACKEND
// uPower and uDisks2 integration
-#if defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2)
+#if defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2) || defined(WITH_CONSOLEKIT)
#include <tqdbusdata.h>
#include <tqdbusmessage.h>
#include <tqdbusproxy.h>