summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2013-10-03 09:59:41 (GMT)
committerChristian Mollekopf <chrigi_1@fastmail.fm>2013-10-03 09:59:41 (GMT)
commit5f42e2883ee8bdba99a19202336c89b0eafdef07 (patch)
tree23666870f41a1996aa11f03f8bd30151c5259ce7
parent5f879bb62512f0779a9b0c7783e5ca37b175647c (diff)
downloadlibcalendaring-5f42e2883ee8bdba99a19202336c89b0eafdef07.tar.gz
Compile KABC & Switched kdepimlibs submodule to a dedicated libcalendaring branch that contains libcalendaring specific fixes.
-rw-r--r--.gitmodules2
-rw-r--r--CMakeLists.txt1
-rw-r--r--kdepimlibs/CMakeLists.txt1
-rw-r--r--kdepimlibs/kabc/CMakeLists.txt151
m---------kdepimlibs/kdepimlibs0
5 files changed, 154 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index e1ac199..25fa874 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
[submodule "kdepimlibs/kdepimlibs"]
path = kdepimlibs/kdepimlibs
url = ssh://mollekopf@git.kolabsys.com/git/kdepimlibs
- branch = kolab/stable/4.10.2
+ branch = kolab/libcalendaring/4.10.2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc8f2ed..cecf75d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ set(GENERIC_LIB_SOVERSION ${LIBCALENDARING_VERSION_MAJOR})
add_definitions(-DKDE_NO_DBUS)
add_definitions(-DKDE_NO_TIMEZONED)
+add_definitions(-DKDE_NO_GUI)
include_directories(includes)
include_directories(kdecore/localization)
diff --git a/kdepimlibs/CMakeLists.txt b/kdepimlibs/CMakeLists.txt
index 47466c1..635ca94 100644
--- a/kdepimlibs/CMakeLists.txt
+++ b/kdepimlibs/CMakeLists.txt
@@ -1,2 +1,3 @@
add_subdirectory(kcalcore)
+add_subdirectory(kabc)
diff --git a/kdepimlibs/kabc/CMakeLists.txt b/kdepimlibs/kabc/CMakeLists.txt
new file mode 100644
index 0000000..f91a3a0
--- /dev/null
+++ b/kdepimlibs/kabc/CMakeLists.txt
@@ -0,0 +1,151 @@
+
+project(kabc)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../kdepimlibs/cmake/modules")
+
+set(LIBCALENDARING_KABC_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../kdepimlibs/kabc")
+
+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)
+endif()
+
+# only available from cmake-2.8.4
+if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND
+ ${CMAKE_PATCH_VERSION} GREATER 3)
+ cmake_policy(SET CMP0017 NEW)
+endif()
+
+
+
+find_package(Qt4 4.6.0 REQUIRED)
+
+include_directories(${QT_INCLUDES})
+
+# include_directories( ${KDE4_KIO_INCLUDES} )
+
+add_definitions(${QDBUS_DEFINITIONS} -DKDE_DEFAULT_DEBUG_AREA=5700)
+add_definitions( -DQT_NO_CAST_FROM_ASCII )
+add_definitions( -DQT_NO_CAST_TO_ASCII )
+add_definitions( -DWANT_DEPRECATED_KABC_API )
+
+# these apply also for all subdirs
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/vcardparser
+ ${LIBCALENDARING_KABC_PATH}
+ ../../kdecore/
+ ../kdepimlibs/
+)
+
+# kabc/vcardparser/Makefile.am: vcards
+
+set(vcards_STAT_SRCS
+ ${LIBCALENDARING_KABC_PATH}/vcardparser/vcard.cpp
+ ${LIBCALENDARING_KABC_PATH}/vcardparser/vcardline.cpp
+ ${LIBCALENDARING_KABC_PATH}/vcardparser/vcardparser.cpp
+)
+
+# add_subdirectory( vcardparser )
+# add_subdirectory( tests )
+#add_subdirectory( scripts )
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripts)
+
+
+
+add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/field.cpp ${CMAKE_CURRENT_BINARY_DIR}/addressee.h ${CMAKE_CURRENT_BINARY_DIR}/addressee.cpp
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripts
+ COMMAND ${PERL_EXECUTABLE} ${LIBCALENDARING_KABC_PATH}/scripts/makeaddressee
+ DEPENDS
+ ${LIBCALENDARING_KABC_PATH}/scripts/makeaddressee
+ ${LIBCALENDARING_KABC_PATH}/scripts/addressee.src.cpp
+ ${LIBCALENDARING_KABC_PATH}/scripts/addressee.src.h
+ ${LIBCALENDARING_KABC_PATH}/scripts/entrylist
+ ${LIBCALENDARING_KABC_PATH}/scripts/field.src.cpp
+ )
+
+
+########### next target ###############
+
+set(kabc_LIB_SRCS
+ ${LIBCALENDARING_KABC_PATH}/address.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/addressee.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
+ ${CMAKE_CURRENT_BINARY_DIR}/field.cpp
+ ${LIBCALENDARING_KABC_PATH}/contactgroup.cpp
+ ${LIBCALENDARING_KABC_PATH}/contactgrouptool.cpp
+ ${LIBCALENDARING_KABC_PATH}/errorhandler.cpp
+ ${LIBCALENDARING_KABC_PATH}/geo.cpp
+ ${LIBCALENDARING_KABC_PATH}/key.cpp
+# ldapdn.cpp
+# ldif.cpp
+ ${LIBCALENDARING_KABC_PATH}/phonenumber.cpp
+ ${LIBCALENDARING_KABC_PATH}/picture.cpp
+ ${LIBCALENDARING_KABC_PATH}/plugin.cpp
+ ${LIBCALENDARING_KABC_PATH}/secrecy.cpp
+ ${LIBCALENDARING_KABC_PATH}/sound.cpp
+ ${LIBCALENDARING_KABC_PATH}/timezone.cpp
+# ldifconverter.cpp
+ ${LIBCALENDARING_KABC_PATH}/addresseelist.cpp
+ ${LIBCALENDARING_KABC_PATH}/vcardconverter.cpp
+ ${LIBCALENDARING_KABC_PATH}/vcardtool.cpp
+ ${LIBCALENDARING_KABC_PATH}/addresseehelper.cpp
+# lock.cpp
+# locknull.cpp
+ ${LIBCALENDARING_KABC_PATH}/sortmode.cpp
+# vcarddrag.cpp
+ ${vcards_STAT_SRCS}
+)
+
+set(CMAKE_AUTOMOC TRUE)
+#QT4_AUTOMOC("${kabc_LIB_SRCS}")
+
+# if (NOT WINCE)
+# set(kabc_LIB_SRCS
+# ${kabc_LIB_SRCS}
+# #disabled due to no QTreeWidget
+# emailselectdialog.cpp
+# )
+# endif()
+
+add_library(calendaring-kabc ${LIBRARY_TYPE} ${kabc_LIB_SRCS})
+
+target_link_libraries(calendaring-kabc ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS}
+${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} calendaring-kdecore)
+target_link_libraries(calendaring-kabc LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS})
+
+set_target_properties(calendaring-kabc PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+install(TARGETS calendaring-kabc EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+########### install files ###############
+
+# install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc )
+install( FILES
+ ${LIBCALENDARING_KABC_PATH}/kabc_export.h
+ ${LIBCALENDARING_KABC_PATH}/address.h
+ ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
+ ${LIBCALENDARING_KABC_PATH}/addresseelist.h
+ ${LIBCALENDARING_KABC_PATH}/contactgroup.h
+ ${LIBCALENDARING_KABC_PATH}/contactgrouptool.h
+# ${LIBCALENDARING_KABC_PATH}/ emailselectdialog.h
+ ${LIBCALENDARING_KABC_PATH}/errorhandler.h
+ ${LIBCALENDARING_KABC_PATH}/field.h
+ ${LIBCALENDARING_KABC_PATH}/geo.h
+ ${LIBCALENDARING_KABC_PATH}/key.h
+# ${LIBCALENDARING_KABC_PATH}/ ldifconverter.h
+# ${LIBCALENDARING_KABC_PATH}/ lock.h
+# ${LIBCALENDARING_KABC_PATH}/ locknull.h
+ ${LIBCALENDARING_KABC_PATH}/phonenumber.h
+ ${LIBCALENDARING_KABC_PATH}/picture.h
+ ${LIBCALENDARING_KABC_PATH}/plugin.h
+ ${LIBCALENDARING_KABC_PATH}/secrecy.h
+ ${LIBCALENDARING_KABC_PATH}/sortmode.h
+ ${LIBCALENDARING_KABC_PATH}/sound.h
+ ${LIBCALENDARING_KABC_PATH}/timezone.h
+ ${LIBCALENDARING_KABC_PATH}/vcardconverter.h
+# vcarddrag.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kabc COMPONENT Devel
+)
diff --git a/kdepimlibs/kdepimlibs b/kdepimlibs/kdepimlibs
-Subproject 6392a49cff582c666e6586ed04f7ac5f90c2eba
+Subproject f37314b965bcea0d9bfdcd0840a44556f90838b