Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit b394733e authored by Raymond Wooninck's avatar Raymond Wooninck

Update Qca to use the qt5 branch

REVIEW:122025
parent 2fb4cbcc
......@@ -38,9 +38,9 @@ include(KDECMakeSettings)
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(-DTRANSLATION_DOMAIN="kbounce")
find_package(Phonon4Qt5 CONFIG REQUIRED)
find_package(Qca 2.1.0)
set_package_properties(Qca PROPERTIES DESCRIPTION "Support for encryption"
URL "http://delta.affinix.com/qca"
find_package(Qca-qt5 2.1.0)
set_package_properties(Qca-qt5 PROPERTIES DESCRIPTION "Support for encryption"
URL "http://download.kde.org/stable/qca-qt5"
TYPE REQUIRED)
kde_enable_exceptions()
......
......@@ -26,7 +26,6 @@ include_directories(
# ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/network/
# ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/
# ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/
${QCA2_INCLUDE_DIR}
)
link_directories( ${CMAKE_CURRENT_BINARY_DIR}/iris/ )
......@@ -121,7 +120,7 @@ target_link_libraries(ksirk
KF5::KIOCore
Phonon::phonon4qt5
KF5::NewStuff
qca
qca-qt5
iris_ksirk
KF5KDEGames
KF5KDEGamesPrivate
......
......@@ -134,7 +134,7 @@ endif()
add_library(iris_ksirk SHARED ${libiris_SRCS})
set(iris_ksirk_libs Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml ${IDN_LIBRARY} qca ${ZLIB_LIBRARIES} Qt5::Widgets)
set(iris_ksirk_libs Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml ${IDN_LIBRARY} qca-qt5 ${ZLIB_LIBRARIES} Qt5::Widgets)
if(WIN32)
set(iris_ksirk_libs ${iris_ksirk_libs} ws2_32)
endif(WIN32)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment