[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=e202a52

The following commit has been merged in the master branch:
commit e202a525bc4ac60b86ff61f0f62b161596182706
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Oct 21 16:09:54 2014 +0200

    Don't always include telepathy-qt5
    
    Carry it along with KTp::CommonInternals, so that everyone that pulls
    it will be getting the includes automatically.
---
 CMakeLists.txt     | 1 -
 KTp/CMakeLists.txt | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88b8922..6704780 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,6 @@ add_definitions (
 include_directories (
                      ${CMAKE_CURRENT_BINARY_DIR}
                      ${CMAKE_CURRENT_SOURCE_DIR}
-                     ${TELEPATHY_QT5_INCLUDE_DIR}
 )
 
 if (TELEPATHY_LOGGER_QT5_FOUND)
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index 855096c..e8ed5b7 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -100,6 +100,7 @@ target_link_libraries (KTpCommonInternals
                     KF5::KIOWidgets
                     KF5::KDELibs4Support
 )
+target_include_directories(KTpCommonInternals PUBLIC ${TELEPATHY_QT5_INCLUDE_DIR}) # Remove when TelepathyQt exports include paths properly
 
 install (TARGETS KTpCommonInternals
          EXPORT KTpTargets

-- 
ktp-common-internals packaging