Branch 'build_testing' - akonadi/CMakeLists.txt

Aaron Seigo seigo at kolabsys.com
Mon Nov 17 20:12:07 CET 2014


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

New commits:
commit 8b07f51f42c15b512fd29a070a938b922a9d4d95
Author: Aaron Seigo <aseigo at kde.org>
Date:   Mon Nov 17 20:10:22 2014 +0100

    no qjson vars .. let's blast all vars, and see if a straight up qjson library link line

diff --git a/akonadi/CMakeLists.txt b/akonadi/CMakeLists.txt
index 86163fa..be2f13b 100644
--- a/akonadi/CMakeLists.txt
+++ b/akonadi/CMakeLists.txt
@@ -301,12 +301,12 @@ configure_file(akonadiprivate_export.h.in
 
 get_cmake_property(_variableNames VARIABLES)
 foreach (_variableName ${_variableNames})
-   if (${_variableName} MATCHES "[Qq][Jj][Ss][Oo][Nn]")
+   #   if (${_variableName} MATCHES "[Qq][Jj][Ss][Oo][Nn]")
       message(STATUS "VARIABLE -> ${_variableName}=${${_variableName}}")
-   endif (${_variableName} MATCHES "QJSON|qjson")
+      #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_LIB} ${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})
 set( AKONADI_KDE_DEPS ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} )
 
 if (KDEPIM_MOBILE_UI)




More information about the commits mailing list