Skip to content

Commit 14c74d8

Browse files
ghtmttghtmtt
authoredJul 16, 2018
Merge branch 'master' into processing_sampling
·
ltr-3_40final-3_4_0
2 parents 1a0d0db + 7933c85 commit 14c74d8

File tree

208 files changed

+9235
-1627
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+9235
-1627
lines changed
 

‎.ci/travis/code_layout/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ export CORES=2
1919
mkdir build
2020
pushd build || exit
2121

22-
cmake -DUSE_CCACHE=OFF -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON ..
22+
cmake -DWITH_SERVER=ON -DUSE_CCACHE=OFF -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON ..
2323

2424
popd || exit

‎doc/CMakeLists.txt

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -104,23 +104,16 @@ IF(WITH_APIDOC)
104104
${CMAKE_SOURCE_DIR}/src/quickgui/plugin
105105
)
106106

107-
IF(WITH_SERVER_PLUGINS)
107+
IF(WITH_SERVER)
108108
SET(DOXYGEN_INPUT
109109
${DOXYGEN_INPUT}
110-
${CMAKE_SOURCE_DIR}/src/server/qgsserver.h
111-
${CMAKE_SOURCE_DIR}/src/server/qgscapabilitiescache.h
112-
${CMAKE_SOURCE_DIR}/src/server/qgsserverexception.h
113-
${CMAKE_SOURCE_DIR}/src/server/qgsrequesthandler.h
114-
${CMAKE_SOURCE_DIR}/src/server/qgsserverfilter.h
115-
${CMAKE_SOURCE_DIR}/src/server/qgsaccesscontrolfilter.h
116-
${CMAKE_SOURCE_DIR}/src/server/qgsserverinterface.h
117-
${CMAKE_SOURCE_DIR}/src/server/qgsserverrequest.h
118-
${CMAKE_SOURCE_DIR}/src/server/qgsserverresponse.h
119-
${CMAKE_SOURCE_DIR}/src/server/qgsserverrequest.h
120-
${CMAKE_SOURCE_DIR}/src/server/qgsservice.h
121-
${CMAKE_SOURCE_DIR}/src/server/qgsserviceregistry.h
110+
${CMAKE_SOURCE_DIR}/src/server/
111+
${CMAKE_SOURCE_DIR}/src/server/services/
112+
${CMAKE_SOURCE_DIR}/src/server/services/wms
113+
${CMAKE_SOURCE_DIR}/src/server/services/wfs
114+
${CMAKE_SOURCE_DIR}/src/server/services/wcs
122115
)
123-
ENDIF(WITH_SERVER_PLUGINS)
116+
ENDIF(WITH_SERVER)
124117

125118
SET(DOXYGEN_FILE_PATTERNS *.h *.cpp *.dox)
126119

0 commit comments

Comments
 (0)
Please sign in to comment.