Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 00c59036 authored by Laurent Montel's avatar Laurent Montel 😁

Clean up CMakeLists.txt. Remove include moc

parent 24659379
......@@ -33,8 +33,6 @@ if (Qt5_POSITION_INDEPENDENT_CODE)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-common -Woverloaded-virtual -fno-threadsafe-statics -fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden -fexceptions -UQT_NO_EXCEPTIONS -fPIC -g -std=c++11")
set(KDE_LIBRARIES
KF5::CalendarCore
KF5::CalendarUtils
......@@ -57,15 +55,8 @@ include_directories(
configure_file(libkolab-version.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/libkolab-version.h" @ONLY)
add_subdirectory(kolabformatV2)
add_subdirectory(conversion)
add_subdirectory(calendaring)
add_subdirectory(icalendar)
add_subdirectory(freebusy)
add_subdirectory(utils)
QT5_WRAP_CPP(CALENDARING_MOC calendaring/event.h)
set(KOLAB_SRCS
kolabformat/kolabobject.cpp
kolabformat/xmlobject.cpp
......@@ -75,13 +66,25 @@ set(KOLAB_SRCS
kolabformat/mimeobject.cpp
mime/mimeutils.cpp
utils/porting.cpp
${CONVERSION_SRCS}
${kolabformatv2_SRCS}
${CALENDARING_SRCS}
${ICALENDAR_SRCS}
${CALENDARING_MOC}
${CONVERSION_MOC}
${FREEBUSY_SRCS}
conversion/kcalconversion.cpp
conversion/kabcconversion.cpp
conversion/commonconversion.cpp
conversion/kolabconversion.cpp
conversion/timezoneconverter.cpp
calendaring/calendaring.cpp
calendaring/event.cpp
calendaring/datetimeutils.cpp
icalendar/icalendar.cpp
icalendar/imip.cpp
kolabformatV2/kolabbase.cpp
kolabformatV2/contact.cpp
kolabformatV2/distributionlist.cpp
kolabformatV2/event.cpp
kolabformatV2/task.cpp
kolabformatV2/journal.cpp
kolabformatV2/incidence.cpp
kolabformatV2/note.cpp
freebusy/freebusy.cpp
)
set(KOLAB_LINK_LIBRARIES
......
......@@ -85,5 +85,3 @@ void BenchmarkTests::parsingBenchmarkComparison()
}
QTEST_MAIN(BenchmarkTests)
#include "benchmark.moc"
......@@ -417,5 +417,3 @@ void CalendaringTest::testDateTimeUtils()
}
QTEST_MAIN(CalendaringTest)
#include "calendaringtest.moc"
......@@ -51,5 +51,3 @@ void DebugStreamTest::testHasError()
}
QTEST_MAIN(DebugStreamTest)
#include "debugstreamtest.moc"
......@@ -486,5 +486,3 @@ void FormatTest::proveJPGisLossy()
}
QTEST_MAIN(FormatTest)
#include "formattest.moc"
......@@ -160,5 +160,3 @@ void FreebusyTest::testFB()
// }
QTEST_MAIN(FreebusyTest)
#include "freebusytest.moc"
......@@ -92,5 +92,3 @@ void ICalendarTest::testToIMip()
}
QTEST_MAIN(ICalendarTest)
#include "icalendartest.moc"
......@@ -580,5 +580,3 @@ void KCalConversionTest::testContactConversion()
// }
QTEST_MAIN(KCalConversionTest)
#include "kcalconversiontest.moc"
......@@ -172,5 +172,3 @@ void KolabObjectTest::parseRelationMembers()
}
QTEST_MAIN(KolabObjectTest)
#include "kolabobjecttest.moc"
......@@ -54,5 +54,3 @@ void V2Test::testWriteDistlistUID()
}
QTEST_MAIN(V2Test)
#include "legacyformattest.moc"
......@@ -183,5 +183,3 @@ void MIMEObjectTest::testDistlist()
}
QTEST_MAIN(MIMEObjectTest)
#include "mimeobjecttest.moc"
......@@ -177,5 +177,3 @@ void TimezoneTest::localTimezone()
}
QTEST_MAIN(TimezoneTest)
#include "timezonetest.moc"
......@@ -177,5 +177,3 @@ void UpgradeTest::testContact()
}
QTEST_MAIN(UpgradeTest)
#include "upgradetest.moc"
......@@ -59,5 +59,3 @@ void XMLObjectTest::testDontCrash()
}
QTEST_MAIN(XMLObjectTest)
#include "xmlobjecttest.moc"
set (CALENDARING_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/calendaring.cpp
${CMAKE_CURRENT_SOURCE_DIR}/event.cpp
${CMAKE_CURRENT_SOURCE_DIR}/datetimeutils.cpp
PARENT_SCOPE)
set (CONVERSION_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/kcalconversion.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kabcconversion.cpp
${CMAKE_CURRENT_SOURCE_DIR}/commonconversion.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kolabconversion.cpp
${CMAKE_CURRENT_SOURCE_DIR}/timezoneconverter.cpp PARENT_SCOPE)
set (FREEBUSY_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/freebusy.cpp
PARENT_SCOPE)
set (ICALENDAR_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/icalendar.cpp
${CMAKE_CURRENT_SOURCE_DIR}/imip.cpp
PARENT_SCOPE)
set( kolabformatv2_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/kolabbase.cpp
${CMAKE_CURRENT_SOURCE_DIR}/contact.cpp
${CMAKE_CURRENT_SOURCE_DIR}/distributionlist.cpp
${CMAKE_CURRENT_SOURCE_DIR}/event.cpp
${CMAKE_CURRENT_SOURCE_DIR}/task.cpp
${CMAKE_CURRENT_SOURCE_DIR}/journal.cpp
${CMAKE_CURRENT_SOURCE_DIR}/incidence.cpp
${CMAKE_CURRENT_SOURCE_DIR}/note.cpp
# kolabformatv2.cpp
PARENT_SCOPE)
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