提交 678abfd93ad90c860e277df725c22d74ff408a82

作者 qingxiongf
1 个父辈 5e556b66

fqx

  1 +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -o -lfcgi++ -lfcgi")
1 2
2 3 INCLUDE_DIRECTORIES(
3 4 ${CMAKE_SOURCE_DIR}/src/server/spserver
4 5 )
5 6
  7 +
6 8 ADD_SUBDIRECTORY(spserver)
7 9 ADD_SUBDIRECTORY(services)
8 10
  11 +
  12 +
9 13 ########################################################
10 14 # Files
11 15 SET (DMAP_SERVER_SRCS
... ... @@ -13,8 +17,10 @@ SET (DMAP_SERVER_SRCS
13 17 dmpmainserver.cpp
14 18 dmprequesthandler.cpp
15 19 dmpserver.cpp
16   - dmpservice.cpp
  20 + dmpserverapi.cpp
  21 + dmpserverconfig.cpp
17 22 dmpservercontext.cpp
  23 + dmpserverapicontext.cpp
18 24 dmpserverapihandler.cpp
19 25 dmpserverfilter.cpp
20 26 dmpserverinterface.cpp
... ... @@ -26,9 +32,14 @@ SET (DMAP_SERVER_SRCS
26 32 dmpserverparameters.cpp
27 33 dmpserverplugins.cpp
28 34 dmpserverutils.cpp
29   - dmpservernativeloader.cpp
  35 + dmpserverloader.cpp
  36 + dmpserverproject.cpp
  37 + dmpserverregistry.cpp
30 38 python/dmppythonutils.cpp
31 39 python/dmpserverwrapper.cpp
  40 + dmphttpbase.cpp
  41 + dmphttputils.cpp
  42 +
32 43 )
33 44
34 45 SET (DMAP_SERVER_HDRS
... ... @@ -36,8 +47,12 @@ SET (DMAP_SERVER_HDRS
36 47 dmpmainserver.h
37 48 dmprequesthandler.h
38 49 dmpserver.h
  50 + dmpserverapi.h
39 51 dmpserverapihandler.h
  52 + dmpserverapicontext.h
40 53 dmpservercontext.h
  54 + dmpserverconfig.h
  55 + dmpserverentity.h
41 56 dmpserverfilter.h
42 57 dmpserverinterface.h
43 58 dmpserverinterfaceimpl.h
... ... @@ -50,15 +65,24 @@ SET (DMAP_SERVER_HDRS
50 65 dmpserverutils.h
51 66 dmpservice.h
52 67 dmpservermodule.h
53   - dmpservernativeloader.h
  68 + dmpserverloader.h
  69 + dmpserverproject.h
  70 + dmpserverregistry.h
54 71 python/dmppythonutils.h
  72 + dmphttpbase.h
  73 + dmphttputils.h
  74 +
55 75 )
56 76
57 77 #############################################################
58 78 # dmap_server library
59 79
  80 +
  81 +
60 82 INCLUDE_DIRECTORIES(
61 83 ${CMAKE_SOURCE_DIR}/src/core
  84 + ${CMAKE_SOURCE_DIR}/src/core/geometry
  85 + ${CMAKE_SOURCE_DIR}/src/core/symbology
62 86 )
63 87
64 88 INCLUDE_DIRECTORIES(SYSTEM
... ... @@ -101,6 +125,7 @@ target_include_directories(dmap_server
101 125 )
102 126 MESSAGE(STATUS "dmap_server path: ${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}")
103 127
  128 +
104 129 add_executable(dmap_spserv
105 130 dmap_spserv.cpp
106 131 dmpspserverrequest.h
... ... @@ -109,13 +134,46 @@ add_executable(dmap_spserv
109 134 dmpspserverresponse.cpp
110 135 )
111 136
  137 +add_executable(dmap_serv
  138 + dmap_serv.cpp
  139 + dmpapacheserverrequest.h
  140 + dmpapacheserverresponse.h
  141 + dmpapacheserverrequest.cpp
  142 + dmpapacheserverresponse.cpp
  143 +)
  144 +
112 145 target_link_libraries(dmap_spserv
113 146 spserver
114 147 dmap_server
115 148 )
116 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 +)
117 171 ########################################################
118 172 # Install
  173 +INSTALL(FILES
  174 + dmpserver.ini
  175 + DESTINATION ${DMAP_LIBEXEC_SUBDIR}
  176 +)
119 177
120 178 INSTALL(TARGETS dmap_server
121 179 RUNTIME DESTINATION ${DMAP_BIN_DIR}
... ... @@ -124,6 +182,10 @@ INSTALL(TARGETS dmap_server
124 182 PUBLIC_HEADER DESTINATION ${DMAP_INCLUDE_DIR}
125 183 )
126 184
  185 +INSTALL(TARGETS dmap_serv
  186 + DESTINATION ${DMAP_BIN_DIR}
  187 +)
  188 +
127 189 INSTALL(TARGETS dmap_spserv
128 190 DESTINATION ${DMAP_BIN_DIR}
129 191 )
\ No newline at end of file
... ...
... ... @@ -232,7 +232,7 @@ void DmpManagerApiHandler::reloadServices(const DmpServerApiContext &context) co
232 232 {
233 233 case DmpServerRequest::Method::GET_METHOD:
234 234 {
235   - if(context.manager()->LoadServices()) {
  235 + if(context.manager()->loadServices()) {
236 236 context.response()->write("{\"status\":\"true\",\"message\":\"重载服务成功\"}");
237 237 }else{
238 238 context.response()->write("{\"status\":\"false\",\"message\":\"重载服务失败\"}");
... ...
注册登录 后发表评论