[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=506bd2a

The following commit has been merged in the master branch:
commit 506bd2a8902354c47b1fa4f7ad670a0fc328b8bd
Author: Sebastian Kügler <sebas at kde.org>
Date:   Sun Sep 7 14:12:00 2014 +0200

    add qjson includes at top-level
    
    It's needed by plugins as well, not just by the core.
    
    Reviewed-by: Aleix
---
 CMakeLists.txt      | 2 +-
 core/CMakeLists.txt | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d3cfe1..426394f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ include(ECMInstallIcons)
 include(FeatureSummary)
 
 include(GenerateExportHeader)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${QJSON_INCLUDE_DIR})
 
 add_subdirectory(core)
 add_subdirectory(kcm)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 88084ed..ab2bc62 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -8,7 +8,6 @@ set(KDECONNECT_VERSION_PATCH 1)
 set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}")
 
 include_directories(
-    ${QJSON_INCLUDE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${QCA2_INCLUDE_DIR}
 )

-- 
kdeconnect packaging