diff options
| author | Christophe Giboudeaux <cgiboudeaux@gmx.com> | 2017-04-27 14:51:38 (GMT) |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2017-05-05 13:48:29 (GMT) |
| commit | dc031319f50bb549937e1a39ea94acca9b6702c9 (patch) | |
| tree | 1bd18c0fc877f82146f0f2bae0073ae2c2044c47 | |
| parent | 012576771c1ea4706f73243781eeb76e813a9937 (diff) | |
Fix build with CMake 3.8.
Before CMake 3.8, automoc'ed files were saved in the build directory.
With CMake 3.8, they're now saved into $targetName_autogen/include and exported
to $targetName's INCLUDE_DIRECTORIES variable.
mailserializertest.cpp #includes akonadi_serializer_mail.cpp
which #includes moc_akonadi_serializer_mail.cpp.
As a result, CMake had no way to guess where where the automoc'ed file is.
(cherry picked from commit e5c26385a3b047643856dcc423cb13535ff5d132)
| -rw-r--r-- | plugins/autotests/CMakeLists.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/plugins/autotests/CMakeLists.txt b/plugins/autotests/CMakeLists.txt index 4beeb08..09e5f70 100644 --- a/plugins/autotests/CMakeLists.txt +++ b/plugins/autotests/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ) # convenience macro to add akonadi qtestlib unit-tests -macro(add_akonadiplugin_test _source _libs _additionalSources) +macro(add_akonadiplugin_test _source _libs _additionalSources _target_included_directories) set(_test ${_source}) set(srcs ${_test} ${_additionalSources}) @@ -19,14 +19,16 @@ macro(add_akonadiplugin_test _source _libs _additionalSources) add_executable( ${_name} ${srcs} ) add_test( ${_name} ${_name} ) ecm_mark_as_test(akonadiplugin-${_name}) - - target_link_libraries(${_name} KF5::AkonadiCore KF5::AkonadiMime + if(NOT ${_target_included_directories} STREQUAL "") + target_include_directories(${_name} PRIVATE "$<BUILD_INTERFACE:$<TARGET_PROPERTY:${_target_included_directories},INCLUDE_DIRECTORIES>>") + endif() + target_link_libraries(${_name} KF5::AkonadiCore KF5::AkonadiMime Qt5::Test KF5::AkonadiPrivate KF5::I18n KF5::AkonadiPrivate ${_libs}) endmacro() # qtestlib unit tests -add_akonadiplugin_test(mailserializertest.cpp "KF5::Mime" "../akonadi_serializer_mail_debug.cpp") -add_akonadiplugin_test(mailserializerplugintest.cpp "KF5::Mime" "") -add_akonadiplugin_test(kcalcoreserializertest.cpp "KF5::CalendarCore" "") -add_akonadiplugin_test(addresseeserializertest.cpp "KF5::Contacts;KF5::AkonadiContact" "../akonadi_serializer_addressee.cpp") +add_akonadiplugin_test(mailserializertest.cpp "KF5::Mime" "../akonadi_serializer_mail_debug.cpp" "akonadi_serializer_mail") +add_akonadiplugin_test(mailserializerplugintest.cpp "KF5::Mime" "" "" ) +add_akonadiplugin_test(kcalcoreserializertest.cpp "KF5::CalendarCore" "" "" ) +add_akonadiplugin_test(addresseeserializertest.cpp "KF5::Contacts;KF5::AkonadiContact" "../akonadi_serializer_addressee.cpp" "") |