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>
pull/9/head
Michele Calgaro 4 years ago
parent cc51bb4eb4
commit 804f6a4d46
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -106,6 +106,16 @@ if( WITH_HAL )
pkg_search_module( HAL hal ) pkg_search_module( HAL hal )
if( HAL_FOUND ) if( HAL_FOUND )
set ( HAVE_HAL 1 ) 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 ( ) else ( )
tde_message_fatal( "hal is required, but was not found on your system" ) tde_message_fatal( "hal is required, but was not found on your system" )
endif( ) endif( )

@ -31,7 +31,7 @@ tde_add_library( k3bdevice SHARED AUTOMOC
k3bdeviceglobals.cpp k3bcrc.cpp k3bcdtext.cpp k3bhalconnection.cpp k3bdeviceglobals.cpp k3bcrc.cpp k3bcdtext.cpp k3bhalconnection.cpp
k3bdebug.cpp k3bdebug.cpp
VERSION 5.0.0 VERSION 5.0.0
LINK tdecore-shared LINK tdecore-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -612,6 +612,21 @@ void K3bDevice::HalConnection::setupDBusTQtConnection( DBusConnection* dbusConne
d->dBusTQtConnection->dbus_connection_setup_with_qt_main( dbusConnection ); 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 #else // HAVE_HAL
#ifdef __TDE_HAVE_TDEHWLIB #ifdef __TDE_HAVE_TDEHWLIB

Loading…
Cancel
Save