current/SOURCES/akonadi-googledata-1.2.0-cmake-various-fix.patch

--- cmake/modules/FindLibGCal.cmake     2010/08/30 18:05:39     1170077
+++ cmake/modules/FindLibGCal.cmake     2010/09/08 14:58:52     1173072
@@ -8,11 +8,12 @@
 #       LIBGCAL_FOUND
 #
 # Copyright (c) 2009 Mike Arthur <mike@mikearthur.co.uk>
-set(LIBGCAL_INCLUDE_DIR "include/libgcal")
-find_path(LIBGCAL_INCLUDE_DIR gcal.h)
 
-set(LIBGCAL_NAMES ${LIBGCAL_NAMES} gcal)
-find_library(LIBGCAL_LIBRARY NAMES ${LIBGCAL_NAMES})
+find_path(LIBGCAL_INCLUDE_DIR 
+          NAMES gcal.h libgcal/gcal.h
+         )
+
+find_library(LIBGCAL_LIBRARY gcal)
 
 # handle the QUIETLY and REQUIRED arguments and set LIBGCAL_FOUND to TRUE if
 # all listed variables are TRUE
1	--- cmake/modules/FindLibGCal.cmake 2010/08/30 18:05:39 1170077
2	+++ cmake/modules/FindLibGCal.cmake 2010/09/08 14:58:52 1173072
3	@@ -8,11 +8,12 @@
4	# LIBGCAL_FOUND
5	#
6	# Copyright (c) 2009 Mike Arthur <mike@mikearthur.co.uk>
7	-set(LIBGCAL_INCLUDE_DIR "include/libgcal")
8	-find_path(LIBGCAL_INCLUDE_DIR gcal.h)
9
10	-set(LIBGCAL_NAMES ${LIBGCAL_NAMES} gcal)
11	-find_library(LIBGCAL_LIBRARY NAMES ${LIBGCAL_NAMES})
12	+find_path(LIBGCAL_INCLUDE_DIR
13	+ NAMES gcal.h libgcal/gcal.h
14	+ )
15	+
16	+find_library(LIBGCAL_LIBRARY gcal)
17
18	# handle the QUIETLY and REQUIRED arguments and set LIBGCAL_FOUND to TRUE if
19	# all listed variables are TRUE