1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
Description: Include mapserver cmake package for additional include directories.
Author: Bas Couwenberg <sebastic@debian.org>
Forwarded: not-needed
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -287,10 +287,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)
|
