diff -up digikam-1.9.0/CMakeLists.txt.marble digikam-1.9.0/CMakeLists.txt
--- digikam-1.9.0/CMakeLists.txt.marble 2011-08-08 14:01:07.651933241 -0500
+++ digikam-1.9.0/CMakeLists.txt 2011-08-08 14:06:09.382210824 -0500
@@ -222,8 +222,18 @@ MACRO_BOOL_TO_01(KDEPIMLIBS_FOUND HAVE_K
SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
# Check MarbleWidget library for geolocation.
+# Special handling for Marble: support both FindMarbleWidget and FindMarble,
MACRO_OPTIONAL_FIND_PACKAGE(MarbleWidget)
MACRO_BOOL_TO_01(MARBLEWIDGET_FOUND HAVE_MARBLEWIDGET)
+IF (NOT MARBLEWIDGET_FOUND)
+ MACRO_OPTIONAL_FIND_PACKAGE(Marble)
+ MACRO_BOOL_TO_01(MARBLE_FOUND HAVE_MARBLEWIDGET)
+ IF (MARBLE_FOUND)
+ SET(MARBLEWIDGET_FOUND TRUE)
+ SET(LIBMARBLEWIDGET_INCLUDE_DIR ${MARBLE_INCLUDE_DIR})
+ SET(LIBMARBLEWIDGET_LIBRARY ${MARBLE_LIBRARIES})
+ ENDIF (MARBLE_FOUND)
+ENDIF (NOT MARBLEWIDGET_FOUND)
IF (MARBLEWIDGET_FOUND)
INCLUDE(libs/imageproperties/markerclusterholderplugin/CheckPluginBuildable.cmake)
ENDIF (MARBLEWIDGET_FOUND)