CMakeLists.txt

[Christian Mollekopf]

 CMakeLists.txt |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit f347017e370bfec5bd400536a21f3681439bcc0e
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Tue May 1 21:21:27 2012 +0200

    Prepare 0.2.0.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52b831e..40b8716 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(Libkolab_MODULE_DIR ${Libkolab_SOURCE_DIR}/cmake/modules)
 set(CMAKE_MODULE_PATH ${Libkolab_MODULE_DIR})
 
 set(Libkolab_VERSION_MAJOR 0)
-set(Libkolab_VERSION_MINOR 1)
+set(Libkolab_VERSION_MINOR 2)
 set(Libkolab_VERSION_PATCH 0)
 set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libkolab_VERSION_PATCH} )
 set(Libkolab_VERSION_STRING ${CMAKE_PROJECT_NAME}-${Libkolab_VERSION})
@@ -22,11 +22,10 @@ set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/Libkolab )
 set(INCLUDE_INSTALL_DIR include/kolab )
 
 # Do the building
-find_library(KOLABXML NAMES kolabxml)
 
 find_package(Qt4 REQUIRED)
 find_package(KDE4 REQUIRED)
-# find_package(Libkolab 0.4 REQUIRED) Works only since libkolabxml 0.4
+find_package(Libkolabxml 0.4 REQUIRED)
 find_package(KolabKDELibraries REQUIRED)
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS} -fPIC" )
@@ -46,8 +45,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 ${KOLABXML} ${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} ${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})
 if(BUILD_TESTS)
     #for tests only
     kde4_add_library(kolab_static STATIC ${KOLAB_SRCS})