Index: darktable-1.6.0/src/CMakeLists.txt
===================================================================
--- darktable-1.6.0/src/CMakeLists.txt
+++ darktable-1.6.0/src/CMakeLists.txt	2014-12-10 23:58:34.539450440 +0100
@@ -513,15 +513,18 @@
   if(LIBSOUP2_FOUND)
     include_directories(SYSTEM ${LIBSOUP2_INCLUDE_DIRS})
     add_definitions(${LIBSOUP2_DEFINITIONS})
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/osm-gps-map/src)
-    add_library(osmgpsmap_static STATIC IMPORTED)
-    set_target_properties(osmgpsmap_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/osm-gps-map/libosmgpsmap.a)
-    add_subdirectory(external/osm-gps-map)
-    list(APPEND LIB_DEPS osmgpsmap)
-    list(APPEND LIBS ${LIBSOUP2_LIBRARIES})
-    list(APPEND STATIC_LIBS osmgpsmap_static)
-    add_definitions("-DHAVE_MAP")
-    message(STATUS "Map mode: enabled")
+    find_package(OsmGpsMap)
+      if(OSMGPSMAP_FOUND)
+        include_directories(${OSMGPSMAP_INCLUDE_DIRS})
+        message(STATUS "OsmGpsMap include dir: ${OSMGPSMAP_INCLUDE_DIRS}")
+        list(APPEND LIBS ${OSMGPSMAP_LIBRARIES})
+        add_definitions(${OSMGPSMAP_DEFINITIONS})
+        add_definitions("-DHAVE_MAP")
+        message(STATUS "Map mode: enabled")
+      else (OSMGPSMAP_FOUND)
+        set(USE_GEO_OFF)
+        message(STATUS "Map mode: disabled, please install osm-gps-map")
+      endif (OSMGPSMAP_FOUND)
   else(LIBSOUP2_FOUND)
     set(USE_GEO OFF)
     message(STATUS "Map mode: disabled, please install libsoup2")