Update CMake rules to change tdehw library to standalone.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/206/head
Slávek Banko 3 years ago
parent 9d54ae0596
commit 48ddee7ba8
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -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( )

@ -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}
)

@ -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}
)

@ -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}
)

@ -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}
)

@ -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}
)

@ -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}

@ -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}
)

@ -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}
)

@ -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}
)

@ -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}
)

@ -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
)

@ -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}
)

Loading…
Cancel
Save