Commit 3bbcb169 authored by Alexander Akulich's avatar Alexander Akulich
Browse files

Bump the required TelepathyQt version to 0.9.8 and use the new targets

TelepathyQt 0.9.8 exports TelepathyQt5::Core and TelepathyQt5::Service instead
of the old 'telepathy-qt5' target.

Use the new targets to fix possible linking issues.

Reviewed By: arojas, tcberner, heikobecker

Differential Revision: https://phabricator.kde.org/D26750
parent 1bd04a0e
...@@ -39,10 +39,10 @@ find_package (KF5 5.11 REQUIRED COMPONENTS ...@@ -39,10 +39,10 @@ find_package (KF5 5.11 REQUIRED COMPONENTS
IconThemes IconThemes
People) People)
set(REQUIRED_TPQT_VERSION 0.9.5) set(REQUIRED_TPQT_VERSION 0.9.8)
find_package (TelepathyQt5 ${REQUIRED_TPQT_VERSION} REQUIRED) find_package (TelepathyQt5 ${REQUIRED_TPQT_VERSION} COMPONENTS Core REQUIRED)
find_package (TelepathyQt5Service ${REQUIRED_TPQT_VERSION} REQUIRED) #used for the otr-proxy find_package (TelepathyQt5 ${REQUIRED_TPQT_VERSION} COMPONENTS Service) #used for the otr-proxy
find_package (TelepathyLoggerQt) find_package (TelepathyLoggerQt)
find_package (KAccounts) find_package (KAccounts)
...@@ -52,7 +52,7 @@ find_package (LibOTR 4.0.0) ...@@ -52,7 +52,7 @@ find_package (LibOTR 4.0.0)
find_package (Libgcrypt) find_package (Libgcrypt)
find_package (telepathy-accounts-signon) find_package (telepathy-accounts-signon)
if (LIBOTR_FOUND AND LIBGCRYPT_FOUND) if (LIBOTR_FOUND AND LIBGCRYPT_FOUND AND TARGET TelepathyQt5::Service)
set(OTR_LIBS_FOUND TRUE) set(OTR_LIBS_FOUND TRUE)
endif () endif ()
......
...@@ -94,7 +94,7 @@ target_link_libraries (KTpCommonInternals ...@@ -94,7 +94,7 @@ target_link_libraries (KTpCommonInternals
Qt5::DBus Qt5::DBus
Qt5::Xml Qt5::Xml
KF5::Wallet #included from wallet-interface.h KF5::Wallet #included from wallet-interface.h
${TELEPATHY_QT5_LIBRARIES} TelepathyQt5::Core
PRIVATE PRIVATE
${ktp_private_LIBS} ${ktp_private_LIBS}
KF5::KIOWidgets KF5::KIOWidgets
...@@ -103,7 +103,6 @@ target_link_libraries (KTpCommonInternals ...@@ -103,7 +103,6 @@ target_link_libraries (KTpCommonInternals
KF5::Notifications KF5::Notifications
KF5::IconThemes KF5::IconThemes
) )
target_include_directories(KTpCommonInternals PUBLIC ${TELEPATHY_QT5_INCLUDE_DIR}) # TODO: Remove when TelepathyQt exports include paths properly
install (TARGETS KTpCommonInternals install (TARGETS KTpCommonInternals
EXPORT KTpTargets EXPORT KTpTargets
......
...@@ -29,11 +29,10 @@ generate_export_header(KTpOTR) ...@@ -29,11 +29,10 @@ generate_export_header(KTpOTR)
target_link_libraries (KTpOTR target_link_libraries (KTpOTR
PUBLIC PUBLIC
Qt5::DBus Qt5::DBus
${TELEPATHY_QT5_LIBRARIES} TelepathyQt5::Core
PRIVATE PRIVATE
KF5::I18n KF5::I18n
) )
target_include_directories(KTpOTR PUBLIC ${TELEPATHY_QT5_INCLUDE_DIR}) # TODO: Remove when TelepathyQt exports include paths properly
install (TARGETS KTpOTR install (TARGETS KTpOTR
EXPORT KTpTargets EXPORT KTpTargets
......
...@@ -22,7 +22,7 @@ add_library(ktp-proxy-lib STATIC ${ktp-proxy_SRCS}) ...@@ -22,7 +22,7 @@ add_library(ktp-proxy-lib STATIC ${ktp-proxy_SRCS})
set(ktp-proxy_LIBS set(ktp-proxy_LIBS
${LIBOTR_LIBRARY} ${LIBOTR_LIBRARY}
${LIBGCRYPT_LIBRARIES} ${LIBGCRYPT_LIBRARIES}
${TELEPATHY_QT5_SERVICE_LIBRARIES} TelepathyQt5::Service
KTp::CommonInternals KTp::CommonInternals
KTp::OTR KTp::OTR
KF5::ConfigGui KF5::ConfigGui
......
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