Attachment 957 Details for Bug 1041 – Fix cmake build of kbugbuster with kcal

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Fix cmake build of kbugbuster with kcal

bp900.diff (text/plain), 2.02 KB, created by Slávek Banko on 2012-11-05 18:11:01 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2012-11-05 18:11:01 CST

Size: 2.02 KB

patch

obsolete

>Index: b/kbugbuster/kresources/CMakeLists.txt
>===================================================================
>--- a/kbugbuster/kresources/CMakeLists.txt	2012-11-05 03:30:26.000000000 +0100
>+++ b/kbugbuster/kresources/CMakeLists.txt	2012-11-06 01:00:15.000000000 +0100
>@@ -9,19 +9,19 @@
> #
> #################################################
> 
>-tde_import( libkmime )
>-tde_import( ktnef )
>-tde_import( libkcal )
>+include( ConfigureChecks.cmake )
> 
> include_directories(
>   ${CMAKE_CURRENT_BINARY_DIR}
>   ${CMAKE_CURRENT_SOURCE_DIR}/../backend
>   ${TDE_INCLUDE_DIR}
>   ${TQT_INCLUDE_DIRS}
>+  ${LIBKCAL_INCLUDE_DIR}
> )
> 
> link_directories(
>   ${TQT_LIBRARY_DIRS}
>+  ${LIBKCAL_LIBRARY_DIR}
> )
> 
> 
>@@ -38,6 +38,6 @@
>   SOURCES
>     kcalresource.cpp kcalresourceconfig.cpp
>     kcalresource_plugin.cpp resourceprefs.kcfgc
>-  LINK kbbbackend_pic-static kcal-shared
>+  LINK kbbbackend_pic-static tdecore-shared kio-shared kabc kcal kresources
>   DESTINATION ${PLUGIN_INSTALL_DIR}
> )
>Index: b/kbugbuster/kresources/ConfigureChecks.cmake
>===================================================================
>--- /dev/null	1970-01-01 00:00:00.000000000 +0000
>+++ b/kbugbuster/kresources/ConfigureChecks.cmake	2012-11-06 01:00:31.000000000 +0100
>@@ -0,0 +1,36 @@
>+#################################################
>+#
>+#  (C) 2012 Slavek Banko
>+#  slavek (DOT) banko (AT) axis.cz
>+#
>+#  Improvements and feedback are welcome
>+#
>+#  This file is released under GPL >= 2
>+#
>+#################################################
>+
>+message( "-- checking for 'libkcal'" )
>+
>+find_path(
>+  LIBKCAL_INCLUDE_DIR
>+    kcalversion.h
>+  PATHS
>+    ${TDE_INCLUDE_DIR}/libkcal
>+    ${TDE_INCLUDE_DIR}
>+    ${TQT_INCLUDE_DIRS}
>+)
>+
>+find_library(
>+  LIBKCAL_LIBRARY
>+    kcal
>+  PATHS
>+    ${TDE_LIB_DIR}
>+    ${TQT_LIBRARY_DIRS}
>+)
>+if( LIBKCAL_LIBRARY )
>+  get_filename_component( LIBKCAL_LIBRARY_DIR ${LIBKCAL_LIBRARY} PATH CACHE )
>+endif( )
>+
>+if( NOT LIBKCAL_INCLUDE_DIR OR NOT LIBKCAL_LIBRARY_DIR )
>+  tde_message_fatal( "libkcal required, but was not found on your system" )
>+endif( )

Actions: View | Diff

Attachments on bug 1041: 956 | 957