More missing build target dependencies (as usual with KDE4, in tests).

Should fix the breakage seen by landry@.
This commit is contained in:
zhuk 2013-10-07 09:26:19 +00:00
parent 0897e26f75
commit 07ec4564e4
2 changed files with 50 additions and 0 deletions

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-plugins_CMakeLists_txt,v 1.1 2013/10/07 09:26:19 zhuk Exp $
Unbreak build.
--- plugins/CMakeLists.txt.orig Mon Oct 7 13:04:13 2013
+++ plugins/CMakeLists.txt Mon Oct 7 13:04:59 2013
@@ -1,5 +1,3 @@
-add_subdirectory( tests )
-
include_directories(
${Boost_INCLUDE_DIR}
)
@@ -74,3 +72,5 @@ install( FILES
akonadi_serializer_kalarm.desktop
DESTINATION ${DATA_INSTALL_DIR}/akonadi/plugins/serializer)
+
+add_subdirectory( tests )

View File

@ -0,0 +1,34 @@
$OpenBSD: patch-plugins_tests_CMakeLists_txt,v 1.1 2013/10/07 09:26:19 zhuk Exp $
Unbreak build.
--- plugins/tests/CMakeLists.txt.orig Mon Oct 7 13:01:51 2013
+++ plugins/tests/CMakeLists.txt Mon Oct 7 13:06:43 2013
@@ -8,21 +8,24 @@ include_directories(
)
# convenience macro to add akonadi qtestlib unit-tests
-macro(add_akonadiplugin_test _source _libs)
+macro(add_akonadiplugin_test _source _libs _depends)
set(_test ${_source})
get_filename_component(_name ${_source} NAME_WE)
kde4_add_unit_test(${_name} TESTNAME akonadiplugin-${_name} ${_test})
target_link_libraries(${_name} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDE4_KDECORE_LIBS}
${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${AKONADI_COMMON_LIBRARIES}
${AKONADI_COMMON_LIBRARIES} ${_libs})
+ if(_depends)
+ add_dependencies(${_name} ${_depends})
+ endif(_depends)
endmacro(add_akonadiplugin_test)
# qtestlib unit tests
-add_akonadiplugin_test(mailserializertest.cpp "${KDEPIMLIBS_KMIME_LIBS}")
-add_akonadiplugin_test(mailserializerplugintest.cpp "${KDEPIMLIBS_KMIME_LIBS}")
+add_akonadiplugin_test(mailserializertest.cpp "${KDEPIMLIBS_KMIME_LIBS}" akonadi_serializer_mail)
+add_akonadiplugin_test(mailserializerplugintest.cpp "${KDEPIMLIBS_KMIME_LIBS}" akonadi_serializer_mail)
-add_akonadiplugin_test(kcalcoreserializertest.cpp "${KDEPIMLIBS_KCALCORE_LIBS}")
+add_akonadiplugin_test(kcalcoreserializertest.cpp "${KDEPIMLIBS_KCALCORE_LIBS}" akonadi_serializer_kcalcore)
if (KDEPIMLIBS_KCAL_LIBS)
- add_akonadiplugin_test(kcalserializertest.cpp "${KDEPIMLIBS_KCAL_LIBS}")
+ add_akonadiplugin_test(kcalserializertest.cpp "${KDEPIMLIBS_KCAL_LIBS}" akonadi_serializer_kcal)
endif ()