summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2012-06-27 07:51:17 (GMT)
committerChristian Mollekopf <chrigi_1@fastmail.fm>2012-06-27 07:51:17 (GMT)
commit07d18252637286c56fcf7abc2414adfbb0b1391f (patch)
tree5b3f9d855ace49bf83b689d6927f6e2aabcb0c5f
parentf4a1668ab4aba34ab39c271527cdbaff8557b52c (diff)
downloadlibcalendaring-07d18252637286c56fcf7abc2414adfbb0b1391f.tar.gz
fixed kcalcore
-rw-r--r--kcalcore/CMakeLists.txt86
-rw-r--r--kcalcore/calendar.cpp1
-rw-r--r--kcalcore/calstorage.cpp2
3 files changed, 47 insertions, 42 deletions
diff --git a/kcalcore/CMakeLists.txt b/kcalcore/CMakeLists.txt
index 905d82f..8bce4cd 100644
--- a/kcalcore/CMakeLists.txt
+++ b/kcalcore/CMakeLists.txt
@@ -118,6 +118,8 @@ set(kcalcore_LIB_SRCS ${libversit_SRCS}
visitor.cpp
)
+QT4_AUTOMOC("${kcalcore_LIB_SRCS}")
+
add_library(calendaring-kcalcore ${LIBRARY_TYPE} ${kcalcore_LIB_SRCS})
# generate_export_header(kcalcore)
@@ -130,12 +132,12 @@ endif()
# set(libcalendaring-kcalcore ${libcalendaring-kcalcore} PARENT_SCOPE)
# message("${libcalendaring-kcalcore}")
-# set_target_properties(libcalendaring-kcalcore PROPERTIES
-# VERSION ${ECM_VERSION_STRING}
-# SOVERSION ${ECM_SOVERSION}
-# )
+set_target_properties(calendaring-kcalcore PROPERTIES
+ VERSION ${ECM_VERSION_STRING}
+ SOVERSION ${ECM_SOVERSION}
+)
-# install(TARGETS kcalcore EXPORT kdepimlibsLibraryTargets ${ECM_TARGET_DEFAULT_ARGS})
+install(TARGETS calendaring-kcalcore EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
########### next target ###############
@@ -143,40 +145,40 @@ endif()
########### install files ###############
-# install(FILES
-# ${CMAKE_CURRENT_BINARY_DIR}/kcalcore_export.h
-# alarm.h
-# attachment.h
-# attendee.h
-# calendar.h
-# calfilter.h
-# calformat.h
-# calstorage.h
-# compat.h
-# customproperties.h
-# duration.h
-# event.h
-# exceptions.h
-# filestorage.h
-# freebusy.h
-# freebusycache.h
-# freebusyperiod.h
-# freebusyurlstore.h
-# icalformat.h
-# icaltimezones.h
-# incidence.h
-# incidencebase.h
-# journal.h
-# memorycalendar.h
-# period.h
-# person.h
-# recurrence.h
-# recurrencerule.h
-# schedulemessage.h
-# sortablelist.h
-# sorting.h
-# supertrait.h
-# todo.h
-# vcalformat.h
-# visitor.h
-# DESTINATION ${INCLUDE_INSTALL_DIR}/kcalcore COMPONENT Devel)
+install(FILES
+ kcalcore_export.h
+ alarm.h
+ attachment.h
+ attendee.h
+ calendar.h
+ calfilter.h
+ calformat.h
+ calstorage.h
+ compat.h
+ customproperties.h
+ duration.h
+ event.h
+ exceptions.h
+ filestorage.h
+ freebusy.h
+ freebusycache.h
+ freebusyperiod.h
+ freebusyurlstore.h
+ icalformat.h
+ icaltimezones.h
+ incidence.h
+ incidencebase.h
+ journal.h
+ memorycalendar.h
+ period.h
+ person.h
+ recurrence.h
+ recurrencerule.h
+ schedulemessage.h
+ sortablelist.h
+ sorting.h
+ supertrait.h
+ todo.h
+ vcalformat.h
+ visitor.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kcalcore COMPONENT Devel)
diff --git a/kcalcore/calendar.cpp b/kcalcore/calendar.cpp
index 85b097f..c60bb4a 100644
--- a/kcalcore/calendar.cpp
+++ b/kcalcore/calendar.cpp
@@ -1500,3 +1500,4 @@ void Calendar::virtual_hook( int id, void *data )
Q_ASSERT( false );
}
+#include "calendar.moc" \ No newline at end of file
diff --git a/kcalcore/calstorage.cpp b/kcalcore/calstorage.cpp
index af96d43..f41939e 100644
--- a/kcalcore/calstorage.cpp
+++ b/kcalcore/calstorage.cpp
@@ -62,3 +62,5 @@ Calendar::Ptr CalStorage::calendar() const
{
return d->mCalendar;
}
+
+#include "calstorage.moc" \ No newline at end of file