summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2013-10-03 15:33:56 (GMT)
committerChristian Mollekopf <chrigi_1@fastmail.fm>2013-10-03 15:33:56 (GMT)
commitdd38001c63a6ea06fcd99092a791e76707fc95a8 (patch)
tree349af299a8b4ded799b2d61d74dda0a312da221f
parent642096931ee251a9aa2dd9b1ef7b4411574fa066 (diff)
downloadlibcalendaring-dd38001c63a6ea06fcd99092a791e76707fc95a8.tar.gz
compile again with cmake 2.6
-rw-r--r--CMakeLists.txt4
-rw-r--r--kdepimlibs/CMakeLists.txt19
-rw-r--r--kdepimlibs/kabc/CMakeLists.txt9
-rw-r--r--kdepimlibs/kcalcore/CMakeLists.txt12
m---------kdepimlibs/kdepimlibs0
-rw-r--r--kdepimlibs/kimap/CMakeLists.txt53
6 files changed, 34 insertions, 63 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cecf75d..d347ed2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 2.6)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wl,--no-undefined" )
@@ -48,7 +48,7 @@ set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION ${BIN_INSTALL_DIR}
add_subdirectory(kdecore)
add_subdirectory(kdepimlibs)
-install( FILES kdemacros.h
+install( FILES includes/kdemacros.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
# set(static_libs ${CMAKE_CURRENT_BINARY_DIR}/kdecore/libcalendaring-kdecore.a
diff --git a/kdepimlibs/CMakeLists.txt b/kdepimlibs/CMakeLists.txt
index 2320d53..eaf251f 100644
--- a/kdepimlibs/CMakeLists.txt
+++ b/kdepimlibs/CMakeLists.txt
@@ -9,9 +9,6 @@ set(LIBCALENDARING_KMIME_PATH "${CMAKE_CURRENT_SOURCE_DIR}/kdepimlibs/kmime")
set(LIBCALENDARING_KPIMUTILS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/kdepimlibs/kpimutils")
set(LIBCALENDARING_KCALUTILS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/kdepimlibs/kcalutils")
-
-cmake_minimum_required(VERSION 2.6)
-
# only available from cmake-2.8.0
if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7)
cmake_policy(SET CMP0012 NEW)
@@ -40,3 +37,19 @@ add_subdirectory(kpimutils)
add_subdirectory(kcalutils)
add_subdirectory(kimap)
add_subdirectory(notes)
+add_subdirectory(kdepimlibs/includes)
+
+
+#macro(install_headers _dir)
+# install( DIRECTORY ${_dir} DESTINATION ${INCLUDE_INSTALL_DIR}/KDE )
+#endmacro(install_headers _dir)
+#
+#install_headers( KABC )
+#install_headers( KCalCore )
+#install_headers( KCalUtils )
+#install_headers( KIMAP )
+#install_headers( KLDAP )
+#install_headers( KMime )
+#install_headers( KPIMUtils )
+
+
diff --git a/kdepimlibs/kabc/CMakeLists.txt b/kdepimlibs/kabc/CMakeLists.txt
index 8bdea89..cb785f6 100644
--- a/kdepimlibs/kabc/CMakeLists.txt
+++ b/kdepimlibs/kabc/CMakeLists.txt
@@ -74,9 +74,6 @@ set(kabc_LIB_SRCS
${vcards_STAT_SRCS}
)
-set(CMAKE_AUTOMOC TRUE)
-#QT4_AUTOMOC("${kabc_LIB_SRCS}")
-
# if (NOT WINCE)
# set(kabc_LIB_SRCS
# ${kabc_LIB_SRCS}
@@ -85,7 +82,11 @@ set(CMAKE_AUTOMOC TRUE)
# )
# endif()
-add_library(calendaring-kabc ${LIBRARY_TYPE} ${kabc_LIB_SRCS})
+qt4_wrap_cpp(MOC_OUTPUT
+ ${LIBCALENDARING_KABC_PATH}/addresseehelper.h
+)
+
+add_library(calendaring-kabc ${LIBRARY_TYPE} ${kabc_LIB_SRCS} ${MOC_OUTPUT})
target_link_libraries(calendaring-kabc ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS}
${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} calendaring-kdecore)
diff --git a/kdepimlibs/kcalcore/CMakeLists.txt b/kdepimlibs/kcalcore/CMakeLists.txt
index ed95e25..630dbbb 100644
--- a/kdepimlibs/kcalcore/CMakeLists.txt
+++ b/kdepimlibs/kcalcore/CMakeLists.txt
@@ -55,7 +55,8 @@ set(libversit_SRCS
${LIBCALENDARING_KCALCORE_PATH}/versit/vobject.c
)
-set(kcalcore_LIB_SRCS ${libversit_SRCS}
+set(kcalcore_LIB_SRCS
+ ${libversit_SRCS}
${LIBCALENDARING_KCALCORE_PATH}/alarm.cpp
${LIBCALENDARING_KCALCORE_PATH}/attachment.cpp
${LIBCALENDARING_KCALCORE_PATH}/attendee.cpp
@@ -91,10 +92,12 @@ set(kcalcore_LIB_SRCS ${libversit_SRCS}
${LIBCALENDARING_KCALCORE_PATH}/visitor.cpp
)
-set(CMAKE_AUTOMOC TRUE)
-# QT4_AUTOMOC(${kcalcore_LIB_SRCS})
+qt4_wrap_cpp(MOC_OUTPUT
+ ${LIBCALENDARING_KCALCORE_PATH}/calendar.h
+ ${LIBCALENDARING_KCALCORE_PATH}/calstorage.h
+)
-add_library(calendaring-kcalcore ${LIBRARY_TYPE} ${kcalcore_LIB_SRCS})
+add_library(calendaring-kcalcore ${LIBRARY_TYPE} ${kcalcore_LIB_SRCS} ${MOC_OUTPUT})
# generate_export_header(kcalcore)
#${KDE4_KDECORE_LIBRARY}
@@ -156,3 +159,4 @@ install(FILES
${LIBCALENDARING_KCALCORE_PATH}/vcalformat.h
${LIBCALENDARING_KCALCORE_PATH}/visitor.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kcalcore COMPONENT Devel)
+
diff --git a/kdepimlibs/kdepimlibs b/kdepimlibs/kdepimlibs
-Subproject a0697d998a95cf5605fc590cfa219a3356a2bcc
+Subproject 63452d11a4031e2fecd195fed549c3717b4276f
diff --git a/kdepimlibs/kimap/CMakeLists.txt b/kdepimlibs/kimap/CMakeLists.txt
index c8cb657..458e2e3 100644
--- a/kdepimlibs/kimap/CMakeLists.txt
+++ b/kdepimlibs/kimap/CMakeLists.txt
@@ -82,59 +82,11 @@ set(kimap_LIB_SRCS
${LIBCALENDARING_KIMAP_PATH}/getmetadatajob.cpp
)
-# MOCFILES
-
-# foreach (SOURCEFILE ${kimap_LIB_SRCS})
-# string (REGEX REPLACE "^(.+)\\.cpp" "\\1.h" HEADERFILE ${SOURCEFILE})
-# QT4_WRAP_CPP(MOC ${HEADERFILE})
-# set(MOCFILES "${MOCFILES} ${MOC}")
-# endforeach()
-#
-# include_directories(${CMAKE_CURRENT_BINARY_DIR})
-#
-# message("${kimap_LIB_HEADERS}")
-
-
-set(CMAKE_AUTOMOC TRUE)
-#QT4_AUTOMOC("${kimap_LIB_SRCS}")
-# QT4_WRAP_CPP(MOC ${kimap_LIB_HEADERS})
-# message("${MOC}")
-# QT4_GENERATE_MOC(fetchjob.h moc_fetchjob.cpp)
-# QT4_GENERATE_MOC(idlejob.h moc_idlejob.cpp)
-# QT4_GENERATE_MOC(listjob.h moc_listjob.cpp)
-# QT4_GENERATE_MOC(loginjob.h moc_loginjob.cpp)
-# QT4_GENERATE_MOC(session.h moc_session.cpp)
-# QT4_GENERATE_MOC(session_p.h moc_session_p.cpp)
-
-# QT4_WRAP_CPP(MOCFILES
-# job.h
-# fetchjob.h
-# idlejob.h
-# listjob.h
-# loginjob.h
-# session.h
-# session_p.h
-# sessionthread_p.h
-# namespacejob.h
-# deletejob.h
-# getquotajob.h
-# getmetadatajob.h
-# listrightsjob.h
-# metadatajobbase.h
-# )
-# add_custom_target(dummy ALL DEPENDS ${MOCFILES})
-#
-# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/deleteacljob.h ${CMAKE_CURRENT_BINARY_DIR}/deleteacljob.moc)
-# message("${CMAKE_CURRENT_SOURCE_DIR}/deleteacljob.h")
-# message("${CMAKE_CURRENT_BINARY_DIR}/deleteacljob.moc")
-# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/closejob.h ${CMAKE_CURRENT_BINARY_DIR}/closejob.moc)
-# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/getquotajob.h ${CMAKE_CURRENT_BINARY_DIR}/getquotajob.moc)
-# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/expungejob.h ${CMAKE_CURRENT_BINARY_DIR}/expungejob.moc)
-# QT4_GENERATE_MOC(${CMAKE_CURRENT_SOURCE_DIR}/selectjob.h ${CMAKE_CURRENT_BINARY_DIR}/selectjob.moc)
+QT4_AUTOMOC("${kimap_LIB_SRCS}")
include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_library(calendaring-kimap ${LIBRARY_TYPE} ${kimap_LIB_SRCS} )
+add_library(calendaring-kimap ${LIBRARY_TYPE} ${kimap_LIB_SRCS} ${MOC_OUTPUT})
target_link_libraries(calendaring-kimap calendaring-kdecore ${QT_QTNETWORK_LIBRARY} ${QT_QTCORE_LIBRARY} calendaring-kmime ${SASL2_LIBRARIES})
@@ -186,3 +138,4 @@ install( FILES
${LIBCALENDARING_KIMAP_PATH}/setmetadatajob.h
${LIBCALENDARING_KIMAP_PATH}/getmetadatajob.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kimap COMPONENT Devel)
+