Move some find_package dependencies to the children directories as agreed

This commit is contained in:
Aleix Pol 2015-04-10 17:48:48 +02:00
parent 48cb087ec8
commit 3caf5e7908
8 changed files with 12 additions and 11 deletions

View file

@ -29,7 +29,7 @@ set(kdeconnectcore_SRCS
device.cpp device.cpp
) )
add_library(kdeconnectcore SHARED ${kdeconnectcore_SRCS}) add_library(kdeconnectcore ${kdeconnectcore_SRCS})
target_link_libraries(kdeconnectcore target_link_libraries(kdeconnectcore
PUBLIC PUBLIC
Qt5::Network Qt5::Network

View file

@ -1,3 +1,5 @@
find_package(KF5 REQUIRED COMPONENTS KIO)
add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-fileitemaction") add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-fileitemaction")
include_directories(${CMAKE_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR})

View file

@ -2,11 +2,9 @@ project(kdeconnectpluginkcm)
add_definitions(-DTRANSLATION_DOMAIN=\"kdeconnect-core\") add_definitions(-DTRANSLATION_DOMAIN=\"kdeconnect-core\")
set(kdeconnectpluginkcm_SRCS find_package(KF5 REQUIRED COMPONENTS KCMUtils)
kdeconnectpluginkcm.cpp
)
add_library(kdeconnectpluginkcm SHARED ${kdeconnectpluginkcm_SRCS}) add_library(kdeconnectpluginkcm kdeconnectpluginkcm.cpp)
target_link_libraries(kdeconnectpluginkcm target_link_libraries(kdeconnectpluginkcm
PUBLIC PUBLIC
kdeconnectcore kdeconnectcore

View file

@ -1,5 +1,6 @@
include_directories(${CMAKE_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR})
add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-kio") add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-kio")
find_package(KF5 REQUIRED COMPONENTS KIO)
set(kio_kdeconnect_PART_SRCS set(kio_kdeconnect_PART_SRCS
kiokdeconnect.cpp kiokdeconnect.cpp

View file

@ -1,8 +1,6 @@
set(kdeconnect_pausemusic_SRCS find_package(KF5 REQUIRED COMPONENTS KCMUtils)
pausemusicplugin.cpp
)
kdeconnect_add_plugin(kdeconnect_pausemusic JSON kdeconnect_pausemusic.json SOURCES ${kdeconnect_pausemusic_SRCS}) kdeconnect_add_plugin(kdeconnect_pausemusic JSON kdeconnect_pausemusic.json SOURCES pausemusicplugin.cpp)
target_link_libraries(kdeconnect_pausemusic target_link_libraries(kdeconnect_pausemusic
kdeconnectcore kdeconnectcore

View file

@ -1,4 +1,4 @@
find_package(KF5 REQUIRED COMPONENTS Notifications) find_package(KF5 REQUIRED COMPONENTS Notifications KIO)
set(kdeconnect_sftp_SRCS set(kdeconnect_sftp_SRCS
mounter.cpp mounter.cpp

View file

@ -1,4 +1,4 @@
find_package(KF5 REQUIRED COMPONENTS Notifications) find_package(KF5 REQUIRED COMPONENTS Notifications KIO)
set(kdeconnect_share_SRCS set(kdeconnect_share_SRCS
shareplugin.cpp shareplugin.cpp

View file

@ -1,3 +1,5 @@
find_package(KF5 REQUIRED COMPONENTS KIO)
include_directories( include_directories(
${KDEConnectCore_BINARY_DIR} ${KDEConnectCore_BINARY_DIR}
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}