The following commit has been merged in the master branch: commit 9b864978b3a137f64e1b75dd715b97cb37167188 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Sep 11 21:26:28 2013 +0200
Add patch to support building with mapserver. diff --git a/debian/changelog b/debian/changelog index 5a5a0e3..e7bdf52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low - mapcache_seed_non_zero_exit.patch (applied upstream) - mapcache_seed_delete_mode.patch (applied upstream) * Refresh mapcache_seed_typo.patch. + * Add patch to support building with mapserver. -- Bas Couwenberg <sebas...@xs4all.nl> Wed, 11 Sep 2013 19:16:06 +0200 diff --git a/debian/patches/cmake-with-mapserver.patch b/debian/patches/cmake-with-mapserver.patch new file mode 100644 index 0000000..0aa5bb8 --- /dev/null +++ b/debian/patches/cmake-with-mapserver.patch @@ -0,0 +1,69 @@ +Description: Add (optional) support for mapserver with CMake. +Author: Bas Couwenberg <sebas...@xs4all.nl> +Origin: https://github.com/sebastic/mapcache/commit/d3e88cc808ea13fe4c562bdb2d867fad6fc300f2 +Bug: https://github.com/mapserver/mapcache/pull/81 +Last-Update: 2013-09-08 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -76,6 +76,7 @@ option(WITH_TIFF "Use TIFFs as a cache b + option(WITH_TIFF_WRITE_SUPPORT "Enable (experimental) support for writable TIFF cache backends" OFF) + option(WITH_GEOTIFF "Allow GeoTIFF metadata creation for TIFF cache backends" OFF) + option(WITH_PCRE "Use PCRE for regex tests" OFF) ++option(WITH_MAPSERVER "Enable (experimental) support for the mapserver library" OFF) + + find_package(PNG) + if(PNG_FOUND) +@@ -212,6 +213,17 @@ if(WITH_GEOTIFF) + endif(GEOTIFF_FOUND) + endif (WITH_GEOTIFF) + ++if(WITH_MAPSERVER) ++ find_package(MAPSERVER) ++ if(MAPSERVER_FOUND) ++ include_directories(${MAPSERVER_INCLUDE_DIR}) ++ target_link_libraries(mapcache ${MAPSERVER_LIBRARY}) ++ set (USE_MAPSERVER 1) ++ else(MAPSERVER_FOUND) ++ report_optional_not_found(MAPSERVER) ++ endif(MAPSERVER_FOUND) ++endif (WITH_MAPSERVER) ++ + + if(UNIX) + target_link_libraries(mapcache ${CMAKE_DL_LIBS} m ) +@@ -259,6 +271,7 @@ status_optional_component("TIFF" "${USE_ + status_optional_component("GeoTIFF" "${USE_GEOTIFF}" "${GEOTIFF_LIBRARY}") + status_optional_component("Experimental TIFF write support" "${USE_TIFF_WRITE}" "${TIFF_LIBRARY}") + status_optional_component("PCRE" "${USE_PCRE}" "${PCRE_LIBRARY}") ++status_optional_component("Experimental mapserver support" "${USE_MAPSERVER}" "${MAPSERVER_LIBRARY}") + + INSTALL(TARGETS mapcache DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +--- /dev/null ++++ b/cmake/FindMAPSERVER.cmake +@@ -0,0 +1,15 @@ ++ ++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) +--- a/include/mapcache-config.h.in ++++ b/include/mapcache-config.h.in +@@ -10,6 +10,7 @@ + #cmakedefine USE_TIFF_WRITE 1 + #cmakedefine USE_GEOTIFF 1 + #cmakedefine USE_PCRE 1 ++#cmakedefine USE_MAPSERVER 1 + + #cmakedefine HAVE_STRNCASECMP 1 + #cmakedefine HAVE_SYMLINK 1 diff --git a/debian/patches/series b/debian/patches/series index 58c17e8..6310cf4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ includepath.patch mapcache_seed_typo.patch +cmake-with-mapserver.patch diff --git a/debian/rules b/debian/rules index fb2e3ca..d56765d 100755 --- a/debian/rules +++ b/debian/rules @@ -38,6 +38,7 @@ COMMON_CONFIG = -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_TIFF=1 \ -DWITH_TIFF_WRITE_SUPPORT=0 \ -DWITH_GEOTIFF=0 \ + -DWITH_MAPSERVER=1 \ -DWITH_PCRE=1 \ -DWITH_APACHE=1 \ -DWITH_VERSION_STRING=1 \ -- Packaging for MapCache _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel