Branch 'build_testing' - 2 commits - akonadi/CMakeLists.txt akonadi/contact

[Aaron Seigo]

 akonadi/CMakeLists.txt         |    6 +++---
 akonadi/contact/CMakeLists.txt |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b7be2c91436e3d099b71649da144b00bd57969a3
Author: Aaron Seigo <aseigo at kde.org>
Date:   Tue Nov 18 10:02:40 2014 +0100

    use the not deprecated INTERFACE_LINK_LIBRARIES

diff --git a/akonadi/CMakeLists.txt b/akonadi/CMakeLists.txt
index fcee560..0a72288 100644
--- a/akonadi/CMakeLists.txt
+++ b/akonadi/CMakeLists.txt
@@ -313,7 +313,7 @@ if (KDEPIM_MOBILE_UI)
 target_link_libraries( akonadi-kde ${QT_QTDECLARATIVE_LIBRARY} )
 endif()
 
-target_link_libraries( akonadi-kde LINK_INTERFACE_LIBRARIES ${AKONADI_KDE_DEPS})
+target_link_libraries( akonadi-kde INTERFACE_LINK_LIBRARIES ${AKONADI_KDE_DEPS})
 
 set_target_properties( akonadi-kde PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 install( TARGETS akonadi-kde EXPORT kdepimlibsLibraryTargets  ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/akonadi/contact/CMakeLists.txt b/akonadi/contact/CMakeLists.txt
index 504e81d..4c04715 100644
--- a/akonadi/contact/CMakeLists.txt
+++ b/akonadi/contact/CMakeLists.txt
@@ -165,7 +165,7 @@ if(PRISON_FOUND)
 target_link_libraries(akonadi-contact ${PRISON_LIBRARIES})
 endif()
 
-target_link_libraries(akonadi-contact LINK_INTERFACE_LIBRARIES
+target_link_libraries(akonadi-contact INTERFACE_LINK_LIBRARIES
                                       akonadi-kde
                                       kabc
                                       kcalcore


commit ec71c098eae30a6d4db1992270717bea29ee5fd6
Author: Aaron Seigo <aseigo at kde.org>
Date:   Tue Nov 18 10:02:22 2014 +0100

    re-enable the filter; doesn't work on the old cmake in 12.04 either way

diff --git a/akonadi/CMakeLists.txt b/akonadi/CMakeLists.txt
index be2f13b..fcee560 100644
--- a/akonadi/CMakeLists.txt
+++ b/akonadi/CMakeLists.txt
@@ -301,9 +301,9 @@ 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 ${QJSON_LIBRARIES})