summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-05-05 11:14:36 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-05-05 11:14:36 (GMT)
commitf01b8f1a613901baa19bfc25a8da07213fccace7 (patch)
treef5011b41bb641f04eb453b8e8b39f64033d3db63
parenta68944346051a146d732d0d4682d06843d6adc2f (diff)
downloadlibkolab-buildsystem.tar.gz
We don't need the custon FindKolabKDELibraries and can use one installed by kdepimlibs instead. Specify required package versions.buildsystem
FindKolabKDELibraries also erroneusly produced absolute library paths, which makes it i.e impossible to use a distro libkolab to build kdepim-runtime (because you can't get the distro libkolab to use your compiled version of kdepimlibs).
-rw-r--r--CMakeLists.txt8
-rw-r--r--cmake/modules/FindKolabKDELibraries.cmake32
2 files changed, 4 insertions, 36 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d579f7a..9dbcdcd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,10 +34,10 @@ set(INCLUDE_INSTALL_DIR include/kolab )
# Do the building
-find_package(Qt4 REQUIRED)
-find_package(KDE4 REQUIRED)
+find_package(Qt4 4.7.0 REQUIRED)
+find_package(KDE4 4.8 REQUIRED)
+find_package(KdepimLibs 4.8 REQUIRED)
find_package(Libkolabxml 0.4 REQUIRED)
-find_package(KolabKDELibraries REQUIRED)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS} -fPIC" )
@@ -57,7 +57,7 @@ add_subdirectory(kolabformatV2)
add_subdirectory(conversion)
set(KOLAB_SRCS kolabformat/kolabobject.cpp kolabformat/errorhandler.cpp mime/mimeutils.cpp ${CONVERSION_SRCS} ${kolabformatv2_SRCS})
-set(KOLAB_LINK_LIBRARIES ${Libkolabxml_LIBRARIES} ${KCALCORE_LIBRARY} ${KABC_LIBRARY} ${KMIME_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${AKONADI-KDE_LIBRARY} ${AKONADI-NOTES_LIBRARY} ${KDE4_KIO_LIBRARY})
+set(KOLAB_LINK_LIBRARIES ${Libkolabxml_LIBRARIES} ${KDEPIMLIBS_KCALCORE_LIBS} ${KDEPIMLIBS_KABC_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_NOTES_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KIO_LIBRARY})
if(BUILD_TESTS)
#for tests only
kde4_add_library(kolab_static STATIC ${KOLAB_SRCS})
diff --git a/cmake/modules/FindKolabKDELibraries.cmake b/cmake/modules/FindKolabKDELibraries.cmake
deleted file mode 100644
index 3b12734..0000000
--- a/cmake/modules/FindKolabKDELibraries.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-#Find some libraries
-find_library(KCALCORE_LIBRARY NAMES kcalcore PATH_SUFFIXES kde4/devel)
-if(KCALCORE_LIBRARY)
- set(KCALCORE_LIBRARY_FOUND ON)
- message("KCalCore found: ${KCALCORE_LIBRARY}")
- find_path(KDEPIMLIBS_INCLUDE_DIRS NAMES kcalcore/event.h)
-endif(KCALCORE_LIBRARY)
-
-find_library(KMIME_LIBRARY NAMES kmime)
-if(KMIME_LIBRARY)
- set(KMIME_LIBRARY_FOUND ON)
- message("KMime found: ${KMIME_LIBRARY}")
-endif(KMIME_LIBRARY)
-
-find_library(KABC_LIBRARY NAMES kabc)
-if(KABC_LIBRARY)
- set(KABC_LIBRARY_FOUND ON)
- message("KABC found: ${KABC_LIBRARY}")
-endif(KABC_LIBRARY)
-
-find_library(AKONADI-KDE_LIBRARY NAMES akonadi-kde)
-if(AKONADI-KDE_LIBRARY)
- set(AKONADI-KDE_LIBRARY_FOUND ON)
- message("AKONADI-KDE found: ${AKONADI-KDE_LIBRARY}")
-endif(AKONADI-KDE_LIBRARY)
-
-find_library(AKONADI-NOTES_LIBRARY NAMES akonadi-notes)
-if(AKONADI-NOTES_LIBRARY)
- set(AKONADI-NOTES_LIBRARY_FOUND ON)
- message("AKONADI-NOTES found: ${AKONADI-NOTES_LIBRARY}")
-endif(AKONADI-NOTES_LIBRARY)
-