Blob Blame History Raw
diff -Nru gpsdrive-2.10pre7.orig/cmake/Modules/FindMapnik.cmake gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake
--- gpsdrive-2.10pre7.orig/cmake/Modules/FindMapnik.cmake	2009-09-11 13:30:56.000000000 +0100
+++ gpsdrive-2.10pre7/cmake/Modules/FindMapnik.cmake	2009-09-11 13:33:36.000000000 +0100
@@ -13,62 +13,4 @@
 #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
-
-if (MAPNIK_LIBRARIES AND MAPNIK_INCLUDE_DIRS)
-  # in cache already
-  set(MAPNIK_FOUND TRUE)
-else (MAPNIK_LIBRARIES AND MAPNIK_INCLUDE_DIRS)
-  find_path(MAPNIK_INCLUDE_DIR
-    NAMES
-      mapnik/config.hpp
-    PATHS
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /sw/include
-  )
-
-  find_library(MAPNIK_LIBRARY
-    NAMES
-      mapnik
-    PATHS
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib
-  )
-
-  if (MAPNIK_LIBRARY)
-    set(MAPNIK_FOUND TRUE)
-  endif (MAPNIK_LIBRARY)
-
-  set(MAPNIK_INCLUDE_DIRS
-    ${MAPNIK_INCLUDE_DIR}
-  )
-
-  if (MAPNIK_FOUND)
-    set(MAPNIK_LIBRARIES
-      ${MAPNIK_LIBRARIES}
-      ${MAPNIK_LIBRARY}
-    )
-  endif (MAPNIK_FOUND)
-
-  if (MAPNIK_INCLUDE_DIRS AND MAPNIK_LIBRARIES)
-     set(MAPNIK_FOUND TRUE)
-  endif (MAPNIK_INCLUDE_DIRS AND MAPNIK_LIBRARIES)
-
-  if (MAPNIK_FOUND)
-    if (NOT Mapnik_FIND_QUIETLY)
-      message(STATUS "Found Mapnik: ${MAPNIK_LIBRARIES}")
-    endif (NOT Mapnik_FIND_QUIETLY)
-  else (MAPNIK_FOUND)
-    if (Mapnik_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find Mapnik")
-    endif (Mapnik_FIND_REQUIRED)
-  endif (MAPNIK_FOUND)
-
-  # show the MAPNIK_INCLUDE_DIRS and MAPNIK_LIBRARIES variables only in the advanced view
-  mark_as_advanced(MAPNIK_INCLUDE_DIRS MAPNIK_LIBRARIES)
-
-endif (MAPNIK_LIBRARIES AND MAPNIK_INCLUDE_DIRS)
-
+pkg_check_modules (MAPNIK REQUIRED mapnik)