[mapcache] 43/43: Update cmake-mapserver-include.patch to rename MAPSERVER to LIBMAPSERVER, fixing a target name collision.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch wheezy-backports
in repository mapcache.

commit c71b9ed292caeb3d683dbcaef30ca028fdc602d0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Oct 9 19:11:59 2013 +0200

    Update cmake-mapserver-include.patch to rename MAPSERVER to LIBMAPSERVER, fixing a target name collision.
---
 debian/changelog                             |  2 +
 debian/patches/cmake-mapserver-include.patch | 72 ++++++++++++++++++++--------
 2 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93ed82f..2999b4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 mapcache (1.2.0-1~bpo70+1linuxminded1) wheezy-backports; urgency=low
 
   * Rebuild for wheezy-backports.
+  * Update cmake-mapserver-include.patch to rename MAPSERVER to LIBMAPSERVER,
+    fixing a target name collision.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 09 Oct 2013 17:50:09 +0200
 
diff --git a/debian/patches/cmake-mapserver-include.patch b/debian/patches/cmake-mapserver-include.patch
index ee74f02..df73549 100644
--- a/debian/patches/cmake-mapserver-include.patch
+++ b/debian/patches/cmake-mapserver-include.patch
@@ -3,43 +3,73 @@ 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)
+@@ -218,14 +218,22 @@ if(WITH_GEOTIFF)
  endif (WITH_GEOTIFF)
  
  if(WITH_MAPSERVER)
 -   find_package(MAPSERVER)
-+  find_package(MAPSERVER)
-   if(MAPSERVER_FOUND)
+-  if(MAPSERVER_FOUND)
 -    include_directories(${MAPSERVER_INCLUDE_DIR})
 -    target_link_libraries(mapcache ${MAPSERVER_LIBRARY})
-+    find_package(mapserver PATHS ${MAPSERVER_CMAKE_PATH})
++  find_package(LIBMAPSERVER)
++  if(LIBMAPSERVER_FOUND)
++    find_package(mapserver PATHS ${LIBMAPSERVER_CMAKE_PATH})
 +    if(mapserver_FOUND)
-+      set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH} ${MAPSERVER_CMAKE_PATH})
++      set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH} ${LIBMAPSERVER_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})
++      include_directories(${LIBMAPSERVER_INCLUDE_DIR})
++      target_link_libraries(mapcache ${LIBMAPSERVER_LIBRARY})
 +    endif(mapserver_FOUND)
      set (USE_MAPSERVER 1)
-   else(MAPSERVER_FOUND)
+-  else(MAPSERVER_FOUND)
++  else(LIBMAPSERVER_FOUND)
      report_optional_not_found(MAPSERVER)
---- a/cmake/FindMAPSERVER.cmake
-+++ b/cmake/FindMAPSERVER.cmake
-@@ -8,8 +8,13 @@ FIND_LIBRARY(MAPSERVER_LIBRARY
-     NAMES mapserver
- )
+-  endif(MAPSERVER_FOUND)
++  endif(LIBMAPSERVER_FOUND)
+ endif (WITH_MAPSERVER)
+ 
  
-+FIND_PATH(MAPSERVER_CMAKE_PATH
+--- a/cmake/FindMAPSERVER.cmake
++++ /dev/null
+@@ -1,15 +0,0 @@
+-
+-FIND_PATH(MAPSERVER_INCLUDE_DIR
+-    NAMES mapserver.h
+-    PATH_SUFFIXES mapserver
+-)
+-
+-FIND_LIBRARY(MAPSERVER_LIBRARY
+-    NAMES mapserver
+-)
+-
+-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)
+--- /dev/null
++++ b/cmake/FindLIBMAPSERVER.cmake
+@@ -0,0 +1,20 @@
++
++FIND_PATH(LIBMAPSERVER_INCLUDE_DIR
++    NAMES mapserver.h
++    PATH_SUFFIXES mapserver
++)
++
++FIND_LIBRARY(LIBMAPSERVER_LIBRARY
++    NAMES mapserver
++)
++
++FIND_PATH(LIBMAPSERVER_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)
++set(LIBMAPSERVER_INCLUDE_DIRS ${LIBMAPSERVER_INCLUDE_DIR})
++set(LIBMAPSERVER_LIBRARIES ${LIBMAPSERVER_LIBRARY})
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(LIBMAPSERVER DEFAULT_MSG LIBMAPSERVER_LIBRARY LIBMAPSERVER_INCLUDE_DIR LIBMAPSERVER_CMAKE_PATH)
++mark_as_advanced(LIBMAPSERVER_LIBRARY LIBMAPSERVER_INCLUDE_DIR LIBMAPSERVER_CMAKE_PATH)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcache.git