tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove usage of KDE4_ variables

Browse source
This commit is contained in:
Aleix Pol 2014-06-18 02:39:30 +02:00
parent 3e74a97304
commit bf272ea3e7
11 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/CMakeLists.txt
View file

@ -2,6 +2,6 @@ include_directories(${CMAKE_SOURCE_DIR})
add_executable(kdeconnect-cli kdeconnect-cli.cpp) add_executable(kdeconnect-cli kdeconnect-cli.cpp)
target_link_libraries(kdeconnect-cli kdeconnectinterfaces Qt5::Gui ${KDE4_KDEUI_LIBS}) target_link_libraries(kdeconnect-cli kdeconnectinterfaces Qt5::Gui KF5::KDELibs4Support)
install(TARGETS kdeconnect-cli ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kdeconnect-cli ${INSTALL_TARGETS_DEFAULT_ARGS})

2
interfaces/CMakeLists.txt
View file

@ -70,9 +70,9 @@ add_dependencies(kdeconnectinterfaces
) )
target_link_libraries(kdeconnectinterfaces target_link_libraries(kdeconnectinterfaces
${KDE4_KDEUI_LIBS}
Qt5::Core Qt5::Core
Qt5::DBus Qt5::DBus
KF5::KDELibs4Support
${QJSON_LIBRARIES} ${QJSON_LIBRARIES}
) )

2
kcm/CMakeLists.txt
View file

@ -17,7 +17,7 @@ add_library(kcm_kdeconnect MODULE ${kcm_SRCS})
target_link_libraries(kcm_kdeconnect target_link_libraries(kcm_kdeconnect
Qt5::Core Qt5::Core
Qt5::Gui Qt5::Gui
${KDE4_KDEUI_LIBRARY} KF5::KDELibs4Support
KF5::KCMUtils KF5::KCMUtils
kdeconnectinterfaces kdeconnectinterfaces
) )

2
plugins/battery/CMakeLists.txt
View file

@ -5,7 +5,7 @@ set(kdeconnect_battery_SRCS
add_library(kdeconnect_battery MODULE ${kdeconnect_battery_SRCS}) add_library(kdeconnect_battery MODULE ${kdeconnect_battery_SRCS})
target_link_libraries(kdeconnect_battery kdeconnectcore ${KDE4_KDEUI_LIBS}) target_link_libraries(kdeconnect_battery kdeconnectcore KF5::KDELibs4Support)
install(TARGETS kdeconnect_battery DESTINATION ${PLUGIN_INSTALL_DIR} ) install(TARGETS kdeconnect_battery DESTINATION ${PLUGIN_INSTALL_DIR} )
install(FILES kdeconnect_battery.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install(FILES kdeconnect_battery.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

2
plugins/notifications/CMakeLists.txt
View file

@ -6,7 +6,7 @@ set(kdeconnect_notifications_SRCS
add_library(kdeconnect_notifications MODULE ${kdeconnect_notifications_SRCS}) add_library(kdeconnect_notifications MODULE ${kdeconnect_notifications_SRCS})
target_link_libraries(kdeconnect_notifications kdeconnectcore ${KDE4_KDEUI_LIBS}) target_link_libraries(kdeconnect_notifications kdeconnectcore KF5::KDELibs4Support)
install(TARGETS kdeconnect_notifications DESTINATION ${PLUGIN_INSTALL_DIR} ) install(TARGETS kdeconnect_notifications DESTINATION ${PLUGIN_INSTALL_DIR} )
install(FILES kdeconnect_notifications.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install(FILES kdeconnect_notifications.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

2
plugins/pausemusic/CMakeLists.txt
View file

@ -21,7 +21,7 @@ qt5_wrap_ui( kdeconnect_pausemusic_config_SRCS pausemusic_config.ui )
add_library(kdeconnect_pausemusic_config MODULE ${kdeconnect_pausemusic_config_SRCS} ) add_library(kdeconnect_pausemusic_config MODULE ${kdeconnect_pausemusic_config_SRCS} )
target_link_libraries( kdeconnect_pausemusic_config target_link_libraries( kdeconnect_pausemusic_config
${KDE4_KDEUI_LIBS} KF5::KDELibs4Support
) )
install( TARGETS kdeconnect_pausemusic_config DESTINATION ${PLUGIN_INSTALL_DIR} ) install( TARGETS kdeconnect_pausemusic_config DESTINATION ${PLUGIN_INSTALL_DIR} )

2
plugins/ping/CMakeLists.txt
View file

@ -4,7 +4,7 @@ set(kdeconnect_ping_SRCS
add_library(kdeconnect_ping MODULE ${kdeconnect_ping_SRCS}) add_library(kdeconnect_ping MODULE ${kdeconnect_ping_SRCS})
target_link_libraries(kdeconnect_ping kdeconnectcore ${KDE4_KDEUI_LIBS}) target_link_libraries(kdeconnect_ping kdeconnectcore KF5::KDELibs4Support)
install(TARGETS kdeconnect_ping DESTINATION ${PLUGIN_INSTALL_DIR} ) install(TARGETS kdeconnect_ping DESTINATION ${PLUGIN_INSTALL_DIR} )
install(FILES kdeconnect_ping.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install(FILES kdeconnect_ping.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

4
plugins/sftp/CMakeLists.txt
View file

@ -6,7 +6,7 @@ set(kdeconnect_sftp_SRCS
add_library(kdeconnect_sftp MODULE ${kdeconnect_sftp_SRCS}) add_library(kdeconnect_sftp MODULE ${kdeconnect_sftp_SRCS})
target_link_libraries(kdeconnect_sftp kdeconnectcore ${KDE4_KFILE_LIBS}) target_link_libraries(kdeconnect_sftp kdeconnectcore KF5::File)
install(TARGETS kdeconnect_sftp DESTINATION ${PLUGIN_INSTALL_DIR} ) install(TARGETS kdeconnect_sftp DESTINATION ${PLUGIN_INSTALL_DIR} )
install(FILES kdeconnect_sftp.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install(FILES kdeconnect_sftp.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
@ -29,7 +29,7 @@ qt5_wrap_ui( kdeconnect_sftp_config_SRCS sftp_config.ui )
add_library(kdeconnect_sftp_config MODULE ${kdeconnect_sftp_config_SRCS} ) add_library(kdeconnect_sftp_config MODULE ${kdeconnect_sftp_config_SRCS} )
target_link_libraries( kdeconnect_sftp_config target_link_libraries( kdeconnect_sftp_config
${KDE4_KDEUI_LIBS} KF5::KDELibs4Support
KF5::KIOWidgets KF5::KIOWidgets
) )

2
plugins/share/CMakeLists.txt
View file

@ -20,7 +20,7 @@ qt5_wrap_ui( kdeconnect_share_config_SRCS share_config.ui )
add_library(kdeconnect_share_config MODULE ${kdeconnect_share_config_SRCS} ) add_library(kdeconnect_share_config MODULE ${kdeconnect_share_config_SRCS} )
target_link_libraries( kdeconnect_share_config target_link_libraries( kdeconnect_share_config
${KDE4_KDEUI_LIBS} KF5::KDELibs4Support
KF5::KIOWidgets KF5::KIOWidgets
) )

2
plugins/telephony/CMakeLists.txt
View file

@ -4,7 +4,7 @@ set(kdeconnect_telephony_SRCS
add_library(kdeconnect_telephony MODULE ${kdeconnect_telephony_SRCS}) add_library(kdeconnect_telephony MODULE ${kdeconnect_telephony_SRCS})
target_link_libraries(kdeconnect_telephony kdeconnectcore ${KDE4_KDEUI_LIBS}) target_link_libraries(kdeconnect_telephony kdeconnectcore KF5::KDELibs4Support)
install(TARGETS kdeconnect_telephony DESTINATION ${PLUGIN_INSTALL_DIR} ) install(TARGETS kdeconnect_telephony DESTINATION ${PLUGIN_INSTALL_DIR} )
install(FILES kdeconnect_telephony.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install(FILES kdeconnect_telephony.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

1
tests/CMakeLists.txt
View file

@ -1,7 +1,6 @@
include_directories( include_directories(
${QJSON_INCLUDE_DIR} ${QJSON_INCLUDE_DIR}
${QCA2_INCLUDE_DIR} ${QCA2_INCLUDE_DIR}
${KDE4_INCLUDES}
${KDEConnectCore_BINARY_DIR} ${KDEConnectCore_BINARY_DIR}
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
) )