Attachment #957 for bug #1041

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. View | Details | Raw Unified | Return to bug 1041
Collapse All | Expand All




#
#################################################

include( ConfigureChecks.cmake )
tde_import( ktnef )
tde_import( libkcal )

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}
)



  SOURCES
    kcalresource.cpp kcalresourceconfig.cpp
    kcalresource_plugin.cpp resourceprefs.kcfgc
  LINK kbbbackend_pic-static tdecore-shared kio-shared kabc kcal kresources
  DESTINATION ${PLUGIN_INSTALL_DIR}
)




#################################################
#
#  (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( )

Return to bug 1041

Lines 9-27 Link Here

(-)a/kbugbuster/kresources/CMakeLists.txt (-4 / +4 lines)
9	#	9	#
10	#################################################	10	#################################################
11		11
12	tde_import( libkmime )	12	include( ConfigureChecks.cmake )
13	tde_import( ktnef )
14	tde_import( libkcal )
15		13
16	include_directories(	14	include_directories(
17	${CMAKE_CURRENT_BINARY_DIR}	15	${CMAKE_CURRENT_BINARY_DIR}
18	${CMAKE_CURRENT_SOURCE_DIR}/../backend	16	${CMAKE_CURRENT_SOURCE_DIR}/../backend
19	${TDE_INCLUDE_DIR}	17	${TDE_INCLUDE_DIR}
20	${TQT_INCLUDE_DIRS}	18	${TQT_INCLUDE_DIRS}
		19	${LIBKCAL_INCLUDE_DIR}
21	)	20	)
22		21
23	link_directories(	22	link_directories(
24	${TQT_LIBRARY_DIRS}	23	${TQT_LIBRARY_DIRS}
		24	${LIBKCAL_LIBRARY_DIR}
25	)	25	)
26		26
27		27
Lines 38-43 Link Here
38	SOURCES	38	SOURCES
39	kcalresource.cpp kcalresourceconfig.cpp	39	kcalresource.cpp kcalresourceconfig.cpp
40	kcalresource_plugin.cpp resourceprefs.kcfgc	40	kcalresource_plugin.cpp resourceprefs.kcfgc
41	LINK kbbbackend_pic-static kcal-shared	41	LINK kbbbackend_pic-static tdecore-shared kio-shared kabc kcal kresources
42	DESTINATION ${PLUGIN_INSTALL_DIR}	42	DESTINATION ${PLUGIN_INSTALL_DIR}
43	)	43	)

Added Link Here

(-)b/kbugbuster/kresources/ConfigureChecks.cmake (+36 lines)
1	#################################################
2	#
3	# (C) 2012 Slavek Banko
4	# slavek (DOT) banko (AT) axis.cz
5	#
6	# Improvements and feedback are welcome
7	#
8	# This file is released under GPL >= 2
9	#
10	#################################################
11
12	message( "-- checking for 'libkcal'" )
13
14	find_path(
15	LIBKCAL_INCLUDE_DIR
16	kcalversion.h
17	PATHS
18	${TDE_INCLUDE_DIR}/libkcal
19	${TDE_INCLUDE_DIR}
20	${TQT_INCLUDE_DIRS}
21	)
22
23	find_library(
24	LIBKCAL_LIBRARY
25	kcal
26	PATHS
27	${TDE_LIB_DIR}
28	${TQT_LIBRARY_DIRS}
29	)
30	if( LIBKCAL_LIBRARY )
31	get_filename_component( LIBKCAL_LIBRARY_DIR ${LIBKCAL_LIBRARY} PATH CACHE )
32	endif( )
33
34	if( NOT LIBKCAL_INCLUDE_DIR OR NOT LIBKCAL_LIBRARY_DIR )
35	tde_message_fatal( "libkcal required, but was not found on your system" )
36	endif( )