Branch 'build_testing' - akonadi/CMakeLists.txt

Aaron Seigo seigo at kolabsys.com
Wed Nov 19 12:28:16 CET 2014


 akonadi/CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ff8a627c4eb245b096b2d0e7e9391f3676b981a2
Author: Aaron Seigo <aseigo at kde.org>
Date:   Wed Nov 19 12:26:46 2014 +0100

    seems like qjson_LIBRARIES gets set :/

diff --git a/akonadi/CMakeLists.txt b/akonadi/CMakeLists.txt
index 0a72288..775374b 100644
--- a/akonadi/CMakeLists.txt
+++ b/akonadi/CMakeLists.txt
@@ -305,8 +305,8 @@ foreach (_variableName ${_variableNames})
       message(STATUS "VARIABLE -> ${_variableName}=${${_variableName}}")
    endif (${_variableName} MATCHES "QJSON|qjson")
 endforeach()
-message("QJson libraries ... QJSON_LIB ${QJSON_LIB} ... QJSON_LIBRARY ${QJSON_LIBRARY} ... QJSON_LIBRARIES ${QJSON_LIBRARIES}")
-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 ${QJSON_LIBRARIES})
+message("QJson libraries ... QJSON_LIB ${QJSON_LIB} ... QJSON_LIBRARY ${QJSON_LIBRARY} ... QJSON_LIBRARIES ${QJSON_LIBRARIES} ... qjson_LIBRARIES ${qjson_LIBRARIES}")
+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} ${QJSON_LIBRARIES})
 set( AKONADI_KDE_DEPS ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} )
 
 if (KDEPIM_MOBILE_UI)




More information about the commits mailing list