Commit 32a33fd2 authored by Kevin Funk's avatar Kevin Funk

Revert "Fix windows build"

That patch was wrong. BUILD_TESTING needs to always be defined when
testing is enabled so the *_TESTS_EXPORT macros are filled out properly.

I think this patch initially just worked around an issue which was fixed
by https://phabricator.kde.org/D20091.

Phabricator Revisino: https://phabricator.kde.org/D28759

This reverts commit 2f552ac5.

Reviewers: vonreth, dvratil, mlaurent, dfaure, winterz

Reviewed By: mlaurent, dfaure

Subscribers: kfunk, vonreth, kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D28759
parent 896f7798
......@@ -61,6 +61,10 @@ endif()
add_definitions(-DQT_NO_FOREACH)
if(BUILD_TESTING)
add_definitions(-DBUILD_TESTING)
endif()
add_subdirectory(src)
add_subdirectory(kcm)
add_subdirectory(serializers)
......
......@@ -113,9 +113,7 @@ ki18n_wrap_ui(akonadicontact_LIB_SRC contactgroupeditor.ui)
add_library(KF5AkonadiContact ${akonadicontact_LIB_SRC})
if (BUILD_TESTING)
target_compile_definitions(KF5AkonadiContact PRIVATE BUILD_TESTING)
endif()
generate_export_header(KF5AkonadiContact BASE_NAME akonadi-contact)
add_library(KF5::AkonadiContact ALIAS KF5AkonadiContact)
......
......@@ -142,9 +142,7 @@ set(contacteditor_LIB_SRC
add_library(KF5ContactEditor ${contacteditor_LIB_SRC})
if (BUILD_TESTING)
target_compile_definitions(KF5ContactEditor PRIVATE BUILD_TESTING)
endif()
generate_export_header(KF5ContactEditor BASE_NAME contacteditor)
add_library(KF5::ContactEditor ALIAS KF5ContactEditor)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment