summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2021-05-03 23:28:27 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2021-05-04 23:37:02 +0900
commit804f6a4d46fa519558a321c4f86c72fd11610759 (patch)
tree46b2b6409117d9daf8e4f6bae21cc4c2834686e8
parentcc51bb4eb48522433b14b1e584dd5dbdb9a0969e (diff)
downloadk3b-804f6a4d.tar.gz
k3b-804f6a4d.zip
Fixed FTBFS when building without tdehw lib but with HAL enabled.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--ConfigureChecks.cmake10
-rw-r--r--libk3bdevice/CMakeLists.txt2
-rw-r--r--libk3bdevice/k3bhalconnection.cpp15
3 files changed, 26 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 03eeb89..b3f7522 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -106,6 +106,16 @@ if( WITH_HAL )
pkg_search_module( HAL hal )
if( HAL_FOUND )
set ( HAVE_HAL 1 )
+ # search for dbus
+ pkg_search_module( DBUS dbus-1 )
+ if( NOT DBUS_FOUND )
+ tde_message_fatal( "dbus-1 is required, but was not found on your system" )
+ endif( )
+ # search for dbus-tqt
+ pkg_search_module( DBUS_TQT dbus-tqt )
+ if( NOT DBUS_TQT_FOUND )
+ tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
+ endif()
else ( )
tde_message_fatal( "hal is required, but was not found on your system" )
endif( )
diff --git a/libk3bdevice/CMakeLists.txt b/libk3bdevice/CMakeLists.txt
index cfb0e29..90c13ed 100644
--- a/libk3bdevice/CMakeLists.txt
+++ b/libk3bdevice/CMakeLists.txt
@@ -31,7 +31,7 @@ tde_add_library( k3bdevice SHARED AUTOMOC
k3bdeviceglobals.cpp k3bcrc.cpp k3bcdtext.cpp k3bhalconnection.cpp
k3bdebug.cpp
VERSION 5.0.0
- LINK tdecore-shared
+ LINK tdecore-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/libk3bdevice/k3bhalconnection.cpp b/libk3bdevice/k3bhalconnection.cpp
index 396237e..9111469 100644
--- a/libk3bdevice/k3bhalconnection.cpp
+++ b/libk3bdevice/k3bhalconnection.cpp
@@ -612,6 +612,21 @@ void K3bDevice::HalConnection::setupDBusTQtConnection( DBusConnection* dbusConne
d->dBusTQtConnection->dbus_connection_setup_with_qt_main( dbusConnection );
}
+void K3bDevice::HalConnection::AddDeviceHandler(TDEGenericDevice* hwdevice)
+{
+ // Empty body, only to avoid linking errors
+}
+
+void K3bDevice::HalConnection::RemoveDeviceHandler(TDEGenericDevice* hwdevice)
+{
+ // Empty body, only to avoid linking errors
+}
+
+void K3bDevice::HalConnection::ModifyDeviceHandler(TDEGenericDevice* hwdevice)
+{
+ // Empty body, only to avoid linking errors
+}
+
#else // HAVE_HAL
#ifdef __TDE_HAVE_TDEHWLIB