Port to new QCA cmake structure, now it's called Qca
and the target name is qca
This commit is contained in:
parent
b086866409
commit
1a1969f42f
5 changed files with 5 additions and 6 deletions
|
@ -7,7 +7,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DI
|
|||
|
||||
find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test)
|
||||
find_package(KF5 REQUIRED COMPONENTS I18n KIO Notifications ConfigWidgets DBusAddons KCMUtils IconThemes)
|
||||
find_package(QCA2 REQUIRED)
|
||||
find_package(Qca REQUIRED)
|
||||
|
||||
include(KDEInstallDirs)
|
||||
include(KDECompilerSettings)
|
||||
|
|
|
@ -9,7 +9,6 @@ set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.
|
|||
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${QCA2_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
add_subdirectory(backends/lan)
|
||||
|
@ -35,8 +34,8 @@ target_link_libraries(kdeconnectcore
|
|||
PUBLIC
|
||||
Qt5::Network
|
||||
KF5::KIOCore
|
||||
qca
|
||||
PRIVATE
|
||||
${QCA2_LIBRARIES}
|
||||
Qt5::DBus
|
||||
Qt5::Gui
|
||||
KF5::KIOWidgets
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/core ${QCA2_INCLUDE_DIR})
|
||||
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/core)
|
||||
add_definitions(-DTRANSLATION_DOMAIN=\"kdeconnect-plugins\")
|
||||
install(FILES kdeconnect_plugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
|
||||
|
||||
|
|
|
@ -41,6 +41,7 @@ target_link_libraries( kdeconnect_sftp_config
|
|||
KF5::KIOWidgets
|
||||
KF5::KCMUtils
|
||||
KF5::IconThemes
|
||||
qca
|
||||
)
|
||||
|
||||
install(TARGETS kdeconnect_sftp_config DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
include_directories(
|
||||
${QCA2_INCLUDE_DIR}
|
||||
${KDEConnectCore_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}
|
||||
)
|
||||
|
@ -7,9 +6,9 @@ include_directories(
|
|||
set(kdeconnect_libraries
|
||||
KF5::KIOWidgets
|
||||
Qt5::Network
|
||||
${QCA2_LIBRARIES}
|
||||
Qt5::Test
|
||||
kdeconnectcore
|
||||
qca
|
||||
)
|
||||
|
||||
ecm_add_test(networkpackagetests.cpp LINK_LIBRARIES ${kdeconnect_libraries})
|
||||
|
|
Loading…
Reference in a new issue