Branch 'kolab/integration/4.13.0' - akonadi/CMakeLists.txt

[Aaron Seigo]

 akonadi/CMakeLists.txt |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e5ab878401c8c9b78414f26684c7714a92648048
Author: Aaron Seigo <aseigo at kde.org>
Date:   Wed Nov 19 15:14:18 2014 +0100

    minimal change to get kdepimlibs to link on systems with qjson 0.7.1

diff --git a/akonadi/CMakeLists.txt b/akonadi/CMakeLists.txt
index ffce7a6..39be647 100644
--- a/akonadi/CMakeLists.txt
+++ b/akonadi/CMakeLists.txt
@@ -300,6 +300,9 @@ configure_file(akonadiprivate_export.h.in
 )
 
 target_link_libraries( akonadi-kde ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTSQL_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${AKONADI_COMMON_LIBRARIES} ${QJSON_LIBRARIES})
+if (NOT USE_QJSON_0_8)
+   target_link_libraries(akonadi-kde ${qjson_LIBRARIES}) # some qjson 0.7.1 packages have broken cmake file
+endif (NOT USE_QJSON_0_8)
 set( AKONADI_KDE_DEPS ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} )
 
 if (KDEPIM_MOBILE_UI)