diff options
| -rw-r--r-- | ConfigureChecks.cmake | 1 | ||||
| -rw-r--r-- | drkonqi/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/displayconfig/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/hwmanager/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kcontrol/randr/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kdesktop/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kdesktop/lock/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kicker/kicker/ui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ksmserver/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdeioslave/media/mediamanager/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdeioslave/media/mounthelper/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdm/cryptocardwatcher/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tdm/kfrontend/CMakeLists.txt | 2 |
13 files changed, 14 insertions, 14 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 0bbf183a1..1119661d5 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -124,6 +124,7 @@ if( WITH_TDEHWLIB ) if( NOT HAVE_TDEHWLIB ) tde_message_fatal( "tdehwlib is required, but not built in tdecore" ) endif( NOT HAVE_TDEHWLIB ) + set( TDEHW_LIBRARIES "tdehw-shared" ) endif( ) diff --git a/drkonqi/CMakeLists.txt b/drkonqi/CMakeLists.txt index ae1be3a87..080dda686 100644 --- a/drkonqi/CMakeLists.txt +++ b/drkonqi/CMakeLists.txt @@ -35,7 +35,7 @@ tde_add_executable( drkonqi AUTOMOC bugdescription.cpp bugdescriptiondialog.cpp sha1.cpp krashconf.cpp drbugreport.cpp backtrace.cpp toplevel.cpp - LINK tdeio-shared ${LIBR_LIBRARIES} + LINK tdeio-shared ${TDEHW_LIBRARIES} ${LIBR_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcontrol/displayconfig/CMakeLists.txt b/kcontrol/displayconfig/CMakeLists.txt index fe83c0941..1b94c2c74 100644 --- a/kcontrol/displayconfig/CMakeLists.txt +++ b/kcontrol/displayconfig/CMakeLists.txt @@ -39,6 +39,6 @@ set_property( SOURCE displayconfig.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_C tde_add_kpart( kcm_displayconfig AUTOMOC SOURCES monitorworkspace.cpp displayconfig.cpp displayconfigbase.ui displayconfig.skel - LINK tdeio-shared tderandr-shared tdeutils-shared + LINK tdeio-shared tderandr-shared tdeutils-shared ${TDEHW_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/hwmanager/CMakeLists.txt b/kcontrol/hwmanager/CMakeLists.txt index 3ac5dbc64..d48e65320 100644 --- a/kcontrol/hwmanager/CMakeLists.txt +++ b/kcontrol/hwmanager/CMakeLists.txt @@ -49,7 +49,7 @@ tde_add_kpart( kcm_hwmanager AUTOMOC SOURCES hwmanager.cpp deviceiconview.cpp devicepropsdlg.cpp devicepropsdlgbase.ui hwmanagerbase.ui cryptpassworddlg.cpp unlockdialog.ui passworddlg.cpp cryptpassworddlgbase.ui hwmanager.skel - LINK tdeio-shared + LINK tdeio-shared ${TDEHW_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -59,6 +59,6 @@ tde_add_executable( tdehwdevicetray AUTOMOC SOURCES hwdevicetray_main.cpp hwdevicetray.cpp hwdevicetray_app.cpp hwdevicetray_configdialog.cpp unlockdialog.ui passworddlg.cpp - LINK tdeio-shared tdeutils-shared tdeui-shared + LINK tdeio-shared tdeutils-shared tdeui-shared ${TDEHW_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcontrol/randr/CMakeLists.txt b/kcontrol/randr/CMakeLists.txt index 25a3a897e..cedfb8f09 100644 --- a/kcontrol/randr/CMakeLists.txt +++ b/kcontrol/randr/CMakeLists.txt @@ -55,6 +55,6 @@ tde_add_executable( tderandrtray AUTOMOC SOURCES main.cpp tderandrtray.cpp tderandrapp.cpp tderandrpassivepopup.cpp configdialog.cpp - LINK tdeutils-shared tderandr-shared + LINK tdeutils-shared tderandr-shared ${TDEHW_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt index 5ee2746cc..ff0394f4b 100644 --- a/kdesktop/CMakeLists.txt +++ b/kdesktop/CMakeLists.txt @@ -97,7 +97,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK pthread kdesktopsettings-static bgnd-static dmctl-static - konq-shared tdeutils-shared tdesu-shared + konq-shared tdeutils-shared tdesu-shared ${TDEHW_LIBRARIES} ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext ${DL_LIBRARIES} ${XSS_LIBRARIES} ${DBUS_1_TQT_LIBRARIES} ) diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt index cc95489f9..8f3e49e16 100644 --- a/kdesktop/lock/CMakeLists.txt +++ b/kdesktop/lock/CMakeLists.txt @@ -40,7 +40,7 @@ set( ${target}_SRCS tde_add_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdesktopsettings-static dmctl-static tdeio-shared Xext + LINK kdesktopsettings-static dmctl-static tdeio-shared Xext ${TDEHW_LIBRARIES} pthread ${GL_LIBRARIES} "${LINKER_IMMEDIATE_BINDING_FLAGS}" DESTINATION ${BIN_INSTALL_DIR} diff --git a/kicker/kicker/ui/CMakeLists.txt b/kicker/kicker/ui/CMakeLists.txt index 754288ce9..315ec73bc 100644 --- a/kicker/kicker/ui/CMakeLists.txt +++ b/kicker/kicker/ui/CMakeLists.txt @@ -56,5 +56,5 @@ set( ${target}_SRCS tde_add_library( ${target} STATIC_PIC AUTOMOC SOURCES ${${target}_SRCS} DEPENDENCIES kicker_core-static - LINK dmctl-static kickoffsearch_interfaces-shared ${DBUS_TQT_LIBRARIES} ${HAL_LIBRARIES} + LINK dmctl-static kickoffsearch_interfaces-shared ${TDEHW_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${HAL_LIBRARIES} ) diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index 8578b01c1..37bd9cfaf 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -50,5 +50,5 @@ tde_add_tdeinit_executable( ksmserver AUTOMOC main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp legacy.cpp startup.cpp shutdown.cpp client.cpp KSMServerInterface.skel server.skel timed.ui - LINK dmctl-static tdeui-shared tdersync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES} + LINK dmctl-static tdeui-shared tdersync-shared ${TDEHW_LIBRARIES} ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES} ) diff --git a/tdeioslave/media/mediamanager/CMakeLists.txt b/tdeioslave/media/mediamanager/CMakeLists.txt index fd0c0f09b..c5150100a 100644 --- a/tdeioslave/media/mediamanager/CMakeLists.txt +++ b/tdeioslave/media/mediamanager/CMakeLists.txt @@ -61,6 +61,6 @@ tde_add_kpart( ${target} AUTOMOC unlockdialog.ui dialog.cpp mediadirnotify.cpp mediadirnotify.skel ${HAL_MEDIA_BACKEND} ${TDEHWBACKEND} - LINK mediacommon-static tdeinit_kded-shared ${HAL_MEDIA_LIBRARIES} + LINK mediacommon-static tdeinit_kded-shared ${TDEHW_LIBRARIES} ${HAL_MEDIA_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeioslave/media/mounthelper/CMakeLists.txt b/tdeioslave/media/mounthelper/CMakeLists.txt index 90afad33f..18c48fc10 100644 --- a/tdeioslave/media/mounthelper/CMakeLists.txt +++ b/tdeioslave/media/mounthelper/CMakeLists.txt @@ -31,6 +31,6 @@ set( ${target}_SRCS tde_add_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK mediacommon-static tdeio-shared + LINK mediacommon-static tdeio-shared ${TDEHW_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdm/cryptocardwatcher/CMakeLists.txt b/tdm/cryptocardwatcher/CMakeLists.txt index 4b4674513..c66161263 100644 --- a/tdm/cryptocardwatcher/CMakeLists.txt +++ b/tdm/cryptocardwatcher/CMakeLists.txt @@ -25,8 +25,7 @@ link_directories( tde_add_executable( tdecryptocardwatcher AUTOMOC SOURCES main.cpp watcher.cpp - LINK tdecore-shared tdeio-shared dmctl-static + LINK tdecore-shared tdeio-shared dmctl-static ${TDEHW_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} SETUID ) - diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt index fa95542df..05472b551 100644 --- a/tdm/kfrontend/CMakeLists.txt +++ b/tdm/kfrontend/CMakeLists.txt @@ -71,7 +71,7 @@ tde_add_executable( tdm_greet AUTOMOC kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp tdmshutdown.cpp tdmadmindialog.cpp kgreeter.cpp kgapp.cpp sakdlg.cpp - LINK tdmthemer-static tdeui-shared tdeio-shared dmctl-static Xtst ${TDMGREET_OPTIONAL_LINK} + LINK tdmthemer-static tdeui-shared tdeio-shared dmctl-static Xtst ${TDEHW_LIBRARIES} ${TDMGREET_OPTIONAL_LINK} DESTINATION ${BIN_INSTALL_DIR} ) |