From 1a1969f42f24b73334064590ca7d774b7e57042e Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Tue, 23 Sep 2014 20:05:22 +0200 Subject: [PATCH] Port to new QCA cmake structure, now it's called Qca and the target name is qca --- CMakeLists.txt | 2 +- core/CMakeLists.txt | 3 +-- plugins/CMakeLists.txt | 2 +- plugins/sftp/CMakeLists.txt | 1 + tests/CMakeLists.txt | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93a8f3f90..84d45ea5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 7b5d16d2a..5caeedcb9 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -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 diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 5e84ac542..058834a9b 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -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}) diff --git a/plugins/sftp/CMakeLists.txt b/plugins/sftp/CMakeLists.txt index f6728159d..8d1fbc997 100644 --- a/plugins/sftp/CMakeLists.txt +++ b/plugins/sftp/CMakeLists.txt @@ -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} ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8a631535b..a02dd244f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -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})