DMapServer / DMapServer4.1 · 提交

提交 48447f79531b4c7a14fc6dbd119282668f44ffc7

作者 LJH 李佳桓
1 个父辈 40a02d82

ljh

内嵌 并排对比
正在显示 1 个修改的文件 包含 190 行增加 和 192 行删除
1   -<<<<<<< HEAD
2   -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -o -lfcgi++ -lfcgi")
3   -
4   -INCLUDE_DIRECTORIES(
5   - ${CMAKE_SOURCE_DIR}/src/server/spserver
6   -)
7   -
8   -
9   -ADD_SUBDIRECTORY(spserver)
10   -ADD_SUBDIRECTORY(services)
11   -
12   -
13   -
14   -########################################################
15   -# Files
16   -SET (DMAP_SERVER_SRCS
17   - dmpfilterresponsedecorator.cpp
18   - dmpmainserver.cpp
19   - dmprequesthandler.cpp
20   - dmpserver.cpp
21   - dmpserverapi.cpp
22   - dmpserverconfig.cpp
23   - dmpservercontext.cpp
24   - dmpserverapicontext.cpp
25   - dmpserverapihandler.cpp
26   - dmpserverfilter.cpp
27   - dmpserverinterface.cpp
28   - dmpserverinterfaceimpl.cpp
29   - dmpservermanager.cpp
30   - dmpservermanagerapi.cpp
31   - dmpserverresponse.cpp
32   - dmpserverrequest.cpp
33   - dmpserverparameters.cpp
34   - dmpserverplugins.cpp
35   - dmpserverutils.cpp
36   - dmpserverloader.cpp
37   - dmpserverproject.cpp
38   - dmpserverregistry.cpp
39   - python/dmppythonutils.cpp
40   - python/dmpserverwrapper.cpp
41   - dmphttpbase.cpp
42   - dmphttputils.cpp
43   -
44   -)
45   -
46   -SET (DMAP_SERVER_HDRS
47   - dmpfilterresponsedecorator.h
48   - dmpmainserver.h
49   - dmprequesthandler.h
50   - dmpserver.h
51   - dmpserverapi.h
52   - dmpserverapihandler.h
53   - dmpserverapicontext.h
54   - dmpservercontext.h
55   - dmpserverconfig.h
56   - dmpserverentity.h
57   - dmpserverfilter.h
58   - dmpserverinterface.h
59   - dmpserverinterfaceimpl.h
60   - dmpservermanager.h
61   - dmpservermanagerapi.h
62   - dmpserverrequest.h
63   - dmpserverresponse.h
64   - dmpserverparameters.h
65   - dmpserverplugins.h
66   - dmpserverutils.h
67   - dmpservice.h
68   - dmpservermodule.h
69   - dmpserverloader.h
70   - dmpserverproject.h
71   - dmpserverregistry.h
72   - python/dmppythonutils.h
73   - dmphttpbase.h
74   - dmphttputils.h
75   -
76   -)
77   -
78   -#############################################################
79   -# dmap_server library
80   -
81   -
82   -
83   -INCLUDE_DIRECTORIES(
84   - ${CMAKE_SOURCE_DIR}/src/core
85   - ${CMAKE_SOURCE_DIR}/src/core/geometry
86   - ${CMAKE_SOURCE_DIR}/src/core/symbology
87   -)
88   -
89   -INCLUDE_DIRECTORIES(SYSTEM
90   - ${PYTHON_INCLUDE_PATH}
91   -)
92   -ADD_LIBRARY(dmap_server SHARED ${DMAP_SERVER_SRCS} ${DMAP_SERVER_HDRS})
93   -
94   -target_link_libraries(dmap_server
95   - dmap_core
96   - ${Boost_LIBRARIES}
97   - Boost::regex
98   - ${PYTHON_LIBRARIES}
99   - dl)
100   -
101   -IF (WITH_BINDINGS)
102   - TARGET_LINK_LIBRARIES(dmap_server
103   - Boost::${DMAP_BOOST_PYTHON_FOUND}
104   - )
105   -ENDIF(WITH_BINDINGS)
106   -
107   -set_target_properties(dmap_server
108   - PROPERTIES
109   - POSITION_INDEPENDENT_CODE 1
110   - CXX_VISIBILITY_PRESET hidden
111   - VISIBILITY_INLINES_HIDDEN 1
112   - #VERSION ${COMPLETE_VERSION}
113   - #SOVERSION ${COMPLETE_VERSION}
114   - )
115   -
116   -generate_export_header(
117   - dmap_server
118   - BASE_NAME SERVER
119   - EXPORT_FILE_NAME "${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}/dmap_server.h"
120   -)
121   -
122   -
123   -target_include_directories(dmap_server
124   - PUBLIC
125   - ${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}
126   - )
127   - MESSAGE(STATUS "dmap_server path: ${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}")
128   -
129   -
130   -add_executable(dmap_spserv
131   - dmap_spserv.cpp
132   - dmpspserverrequest.h
133   - dmpspserverresponse.h
134   - dmpspserverrequest.cpp
135   - dmpspserverresponse.cpp
136   -)
137   -
138   -add_executable(dmap_serv
139   - dmap_serv.cpp
140   - dmpapacheserverrequest.h
141   - dmpapacheserverresponse.h
142   - dmpapacheserverrequest.cpp
143   - dmpapacheserverresponse.cpp
144   -)
145   -
146   -target_link_libraries(dmap_spserv
147   - spserver
148   - dmap_server
149   - )
150   -
151   -target_link_libraries(dmap_serv
152   - dmap_server
153   -)
154   -
155   -INCLUDE_DIRECTORIES(
156   - ${CMAKE_SOURCE_DIR}/pgsql/include
157   -)
158   -LINK_DIRECTORIES(dmap_server ${CMAKE_SOURCE_DIR}/pgsql/lib)
159   -TARGET_LINK_LIBRARIES(dmap_server ${CMAKE_SOURCE_DIR}/pgsql/lib/libpq.so)
160   -
161   -find_package(Fcgi REQUIRED)
162   -if (NOT FCGI_FOUND)
163   - message (SEND_ERROR "Fast CGI dependency was not found!")
164   -endif()
165   -
166   -target_include_directories(dmap_serv SYSTEM PRIVATE
167   - ${FCGI_INCLUDE_DIR}
168   -)
169   -target_link_libraries(dmap_serv
170   - ${FCGI_LIBRARY}
171   -)
172   -########################################################
173   -# Install
174   -INSTALL(FILES
175   - dmpserver.ini
176   - DESTINATION ${DMAP_LIBEXEC_SUBDIR}
177   -)
178   -
179   -INSTALL(TARGETS dmap_server
180   - RUNTIME DESTINATION ${DMAP_BIN_DIR}
181   - LIBRARY DESTINATION ${DMAP_LIB_DIR}
182   - ARCHIVE DESTINATION ${DMAP_LIB_DIR}
183   - PUBLIC_HEADER DESTINATION ${DMAP_INCLUDE_DIR}
184   -)
185   -
186   -INSTALL(TARGETS dmap_serv
187   - DESTINATION ${DMAP_BIN_DIR}
188   -)
189   -
190   -INSTALL(TARGETS dmap_spserv
191   - DESTINATION ${DMAP_BIN_DIR}
  1 +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -o -lfcgi++ -lfcgi")
  2 +
  3 +INCLUDE_DIRECTORIES(
  4 + ${CMAKE_SOURCE_DIR}/src/server/spserver
  5 +)
  6 +
  7 +
  8 +ADD_SUBDIRECTORY(spserver)
  9 +ADD_SUBDIRECTORY(services)
  10 +
  11 +
  12 +
  13 +########################################################
  14 +# Files
  15 +SET (DMAP_SERVER_SRCS
  16 + dmpfilterresponsedecorator.cpp
  17 + dmpmainserver.cpp
  18 + dmprequesthandler.cpp
  19 + dmpserver.cpp
  20 + dmpserverapi.cpp
  21 + dmpserverconfig.cpp
  22 + dmpservercontext.cpp
  23 + dmpserverapicontext.cpp
  24 + dmpserverapihandler.cpp
  25 + dmpserverfilter.cpp
  26 + dmpserverinterface.cpp
  27 + dmpserverinterfaceimpl.cpp
  28 + dmpservermanager.cpp
  29 + dmpservermanagerapi.cpp
  30 + dmpserverresponse.cpp
  31 + dmpserverrequest.cpp
  32 + dmpserverparameters.cpp
  33 + dmpserverplugins.cpp
  34 + dmpserverutils.cpp
  35 + dmpserverloader.cpp
  36 + dmpserverproject.cpp
  37 + dmpserverregistry.cpp
  38 + python/dmppythonutils.cpp
  39 + python/dmpserverwrapper.cpp
  40 + dmphttpbase.cpp
  41 + dmphttputils.cpp
  42 +
  43 +)
  44 +
  45 +SET (DMAP_SERVER_HDRS
  46 + dmpfilterresponsedecorator.h
  47 + dmpmainserver.h
  48 + dmprequesthandler.h
  49 + dmpserver.h
  50 + dmpserverapi.h
  51 + dmpserverapihandler.h
  52 + dmpserverapicontext.h
  53 + dmpservercontext.h
  54 + dmpserverconfig.h
  55 + dmpserverentity.h
  56 + dmpserverfilter.h
  57 + dmpserverinterface.h
  58 + dmpserverinterfaceimpl.h
  59 + dmpservermanager.h
  60 + dmpservermanagerapi.h
  61 + dmpserverrequest.h
  62 + dmpserverresponse.h
  63 + dmpserverparameters.h
  64 + dmpserverplugins.h
  65 + dmpserverutils.h
  66 + dmpservice.h
  67 + dmpservermodule.h
  68 + dmpserverloader.h
  69 + dmpserverproject.h
  70 + dmpserverregistry.h
  71 + python/dmppythonutils.h
  72 + dmphttpbase.h
  73 + dmphttputils.h
  74 +
  75 +)
  76 +
  77 +#############################################################
  78 +# dmap_server library
  79 +
  80 +
  81 +
  82 +INCLUDE_DIRECTORIES(
  83 + ${CMAKE_SOURCE_DIR}/src/core
  84 + ${CMAKE_SOURCE_DIR}/src/core/geometry
  85 + ${CMAKE_SOURCE_DIR}/src/core/symbology
  86 +)
  87 +
  88 +INCLUDE_DIRECTORIES(SYSTEM
  89 + ${PYTHON_INCLUDE_PATH}
  90 +)
  91 +ADD_LIBRARY(dmap_server SHARED ${DMAP_SERVER_SRCS} ${DMAP_SERVER_HDRS})
  92 +
  93 +target_link_libraries(dmap_server
  94 + dmap_core
  95 + ${Boost_LIBRARIES}
  96 + Boost::regex
  97 + ${PYTHON_LIBRARIES}
  98 + dl)
  99 +
  100 +IF (WITH_BINDINGS)
  101 + TARGET_LINK_LIBRARIES(dmap_server
  102 + Boost::${DMAP_BOOST_PYTHON_FOUND}
  103 + )
  104 +ENDIF(WITH_BINDINGS)
  105 +
  106 +set_target_properties(dmap_server
  107 + PROPERTIES
  108 + POSITION_INDEPENDENT_CODE 1
  109 + CXX_VISIBILITY_PRESET hidden
  110 + VISIBILITY_INLINES_HIDDEN 1
  111 + #VERSION ${COMPLETE_VERSION}
  112 + #SOVERSION ${COMPLETE_VERSION}
  113 + )
  114 +
  115 +generate_export_header(
  116 + dmap_server
  117 + BASE_NAME SERVER
  118 + EXPORT_FILE_NAME "${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}/dmap_server.h"
  119 +)
  120 +
  121 +
  122 +target_include_directories(dmap_server
  123 + PUBLIC
  124 + ${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}
  125 + )
  126 + MESSAGE(STATUS "dmap_server path: ${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}")
  127 +
  128 +
  129 +add_executable(dmap_spserv
  130 + dmap_spserv.cpp
  131 + dmpspserverrequest.h
  132 + dmpspserverresponse.h
  133 + dmpspserverrequest.cpp
  134 + dmpspserverresponse.cpp
  135 +)
  136 +
  137 +add_executable(dmap_serv
  138 + dmap_serv.cpp
  139 + dmpapacheserverrequest.h
  140 + dmpapacheserverresponse.h
  141 + dmpapacheserverrequest.cpp
  142 + dmpapacheserverresponse.cpp
  143 +)
  144 +
  145 +target_link_libraries(dmap_spserv
  146 + spserver
  147 + dmap_server
  148 + )
  149 +
  150 +target_link_libraries(dmap_serv
  151 + dmap_server
  152 +)
  153 +
  154 +INCLUDE_DIRECTORIES(
  155 + ${CMAKE_SOURCE_DIR}/pgsql/include
  156 +)
  157 +LINK_DIRECTORIES(dmap_server ${CMAKE_SOURCE_DIR}/pgsql/lib)
  158 +TARGET_LINK_LIBRARIES(dmap_server ${CMAKE_SOURCE_DIR}/pgsql/lib/libpq.so)
  159 +
  160 +find_package(Fcgi REQUIRED)
  161 +if (NOT FCGI_FOUND)
  162 + message (SEND_ERROR "Fast CGI dependency was not found!")
  163 +endif()
  164 +
  165 +target_include_directories(dmap_serv SYSTEM PRIVATE
  166 + ${FCGI_INCLUDE_DIR}
  167 +)
  168 +target_link_libraries(dmap_serv
  169 + ${FCGI_LIBRARY}
  170 +)
  171 +########################################################
  172 +# Install
  173 +INSTALL(FILES
  174 + dmpserver.ini
  175 + DESTINATION ${DMAP_LIBEXEC_SUBDIR}
  176 +)
  177 +
  178 +INSTALL(TARGETS dmap_server
  179 + RUNTIME DESTINATION ${DMAP_BIN_DIR}
  180 + LIBRARY DESTINATION ${DMAP_LIB_DIR}
  181 + ARCHIVE DESTINATION ${DMAP_LIB_DIR}
  182 + PUBLIC_HEADER DESTINATION ${DMAP_INCLUDE_DIR}
  183 +)
  184 +
  185 +INSTALL(TARGETS dmap_serv
  186 + DESTINATION ${DMAP_BIN_DIR}
  187 +)
  188 +
  189 +INSTALL(TARGETS dmap_spserv
  190 + DESTINATION ${DMAP_BIN_DIR}
192 191 =======
193 192 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -o -lfcgi++ -lfcgi")
194 193
... ... @@ -380,5 +379,4 @@ INSTALL(TARGETS dmap_serv
380 379
381 380 INSTALL(TARGETS dmap_spserv
382 381 DESTINATION ${DMAP_BIN_DIR}
383   ->>>>>>> 678abfd93ad90c860e277df725c22d74ff408a82
384 382 )
\ No newline at end of file
... ...
请 注册 或 登录 后发表评论