[SCM] mapcache branch, master, updated. upstream/1.2.0-94-gc9506ab

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit c9506ab2b8ab13c09bc8344098cfe51d59619eee
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Sep 21 20:13:05 2013 +0200

    Add patch to include mapserver cmake package.

diff --git a/debian/changelog b/debian/changelog
index 9f2baa6..a75ca17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ mapcache (1.2.0-1) unstable; urgency=low
   * Enable verbose make output.
   * Call ldconfig in libmapcache postinst and postrm.
   * Update libmapserver dependency for MapServer 6.4.0.
+  * Add patch to include mapserver cmake package.
   * Build-Depend on libtiff-dev for libtiff5 transition.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 11 Sep 2013 19:16:06 +0200
diff --git a/debian/control b/debian/control
index 66acafd..752ad6f 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,8 @@ Build-Depends: debhelper (>= 9),
                libpixman-1-dev,
                libsqlite3-dev,
                libtiff-dev,
-               libmapserver1,
-               libmapserver1-dev,
+               libmapserver1 (>= 6.4.0-2),
+               libmapserver1-dev (>= 6.4.0-2),
                chrpath,
                cmake,
                pkg-config,
diff --git a/debian/patches/cmake-mapserver-include.patch b/debian/patches/cmake-mapserver-include.patch
new file mode 100644
index 0000000..ee74f02
--- /dev/null
+++ b/debian/patches/cmake-mapserver-include.patch
@@ -0,0 +1,45 @@
+Description: Include mapserver cmake package for additional include directories.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-21
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -218,10 +218,18 @@ if(WITH_GEOTIFF)
+ endif (WITH_GEOTIFF)
+ 
+ if(WITH_MAPSERVER)
+-   find_package(MAPSERVER)
++  find_package(MAPSERVER)
+   if(MAPSERVER_FOUND)
+-    include_directories(${MAPSERVER_INCLUDE_DIR})
+-    target_link_libraries(mapcache ${MAPSERVER_LIBRARY})
++    find_package(mapserver PATHS ${MAPSERVER_CMAKE_PATH})
++    if(mapserver_FOUND)
++      set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH} ${MAPSERVER_CMAKE_PATH})
++      include(mapserverTargets)
++      include_directories(${MAPSERVER_INCLUDE_DIRS})
++      target_link_libraries(mapcache mapserver)
++    else(mapserver_FOUND)
++      include_directories(${MAPSERVER_INCLUDE_DIR})
++      target_link_libraries(mapcache ${MAPSERVER_LIBRARY})
++    endif(mapserver_FOUND)
+     set (USE_MAPSERVER 1)
+   else(MAPSERVER_FOUND)
+     report_optional_not_found(MAPSERVER)
+--- a/cmake/FindMAPSERVER.cmake
++++ b/cmake/FindMAPSERVER.cmake
+@@ -8,8 +8,13 @@ FIND_LIBRARY(MAPSERVER_LIBRARY
+     NAMES mapserver
+ )
+ 
++FIND_PATH(MAPSERVER_CMAKE_PATH
++    NAMES mapserverTargets.cmake
++    PATHS /usr/share/mapserver/cmake
++)
++
+ set(MAPSERVER_INCLUDE_DIRS ${MAPSERVER_INCLUDE_DIR})
+ set(MAPSERVER_LIBRARIES ${MAPSERVER_LIBRARY})
+ include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(MAPSERVER DEFAULT_MSG MAPSERVER_LIBRARY MAPSERVER_INCLUDE_DIR)
+-mark_as_advanced(MAPSERVER_LIBRARY MAPSERVER_INCLUDE_DIR)
++find_package_handle_standard_args(MAPSERVER DEFAULT_MSG MAPSERVER_LIBRARY MAPSERVER_INCLUDE_DIR MAPSERVER_CMAKE_PATH)
++mark_as_advanced(MAPSERVER_LIBRARY MAPSERVER_INCLUDE_DIR MAPSERVER_CMAKE_PATH)
diff --git a/debian/patches/series b/debian/patches/series
index 4db24c4..c597b7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 soname.patch
+cmake-mapserver-include.patch

-- 
Packaging for MapCache