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

Use co-installable qca-qt5 version

Browse source 
If both qt4 and qt5 versions of qca are present the build of the
frameworks branch tries to find Qt4 pulled in by qca and thus fails.

REVIEW: 122054
This commit is contained in:
Heiko Becker 2015-01-15 21:35:30 -08:00 committed by Albert Vaca
parent c7c1974ea9
commit 260301155f
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -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(Qt5 5.2 REQUIRED COMPONENTS Quick Test)
find_package(KF5 REQUIRED COMPONENTS I18n KIO Notifications ConfigWidgets DBusAddons KCMUtils IconThemes) find_package(KF5 REQUIRED COMPONENTS I18n KIO Notifications ConfigWidgets DBusAddons KCMUtils IconThemes)
find_package(Qca REQUIRED) find_package(Qca-qt5 2.1.0 REQUIRED)
include(KDEInstallDirs) include(KDEInstallDirs)
include(KDECompilerSettings) include(KDECompilerSettings)

2
core/CMakeLists.txt
View file

@ -35,7 +35,7 @@ target_link_libraries(kdeconnectcore
PUBLIC PUBLIC
Qt5::Network Qt5::Network
KF5::KIOCore KF5::KIOCore
qca qca-qt5
PRIVATE PRIVATE
Qt5::DBus Qt5::DBus
Qt5::Gui Qt5::Gui

2
plugins/sftp/CMakeLists.txt
View file

@ -41,7 +41,7 @@ target_link_libraries( kdeconnect_sftp_config
KF5::KIOWidgets KF5::KIOWidgets
KF5::KCMUtils KF5::KCMUtils
KF5::IconThemes KF5::IconThemes
qca qca-qt5
) )
install(TARGETS kdeconnect_sftp_config DESTINATION ${PLUGIN_INSTALL_DIR} ) install(TARGETS kdeconnect_sftp_config DESTINATION ${PLUGIN_INSTALL_DIR} )

2
tests/CMakeLists.txt
View file

@ -8,7 +8,7 @@ set(kdeconnect_libraries
Qt5::Network Qt5::Network
Qt5::Test Qt5::Test
kdeconnectcore kdeconnectcore
qca qca-qt5
) )
ecm_add_test(networkpackagetests.cpp LINK_LIBRARIES ${kdeconnect_libraries}) ecm_add_test(networkpackagetests.cpp LINK_LIBRARIES ${kdeconnect_libraries})