Skip to content

Commit

Permalink
Add --json option to qgis_process tool
Browse files Browse the repository at this point in the history
This allows external tools to more easily use the standalong qgis_process
tool without resorting to fragile string parsing of the outputs from
that tool.

Refs r-spatial/qgisprocess#21, and means
that we play nice with other tools who want to use QGIS algorithms!
  • Loading branch information
nyalldawson committed Oct 13, 2020
1 parent 7b7a909 commit fc8d916
Show file tree
Hide file tree
Showing 4 changed files with 514 additions and 84 deletions.
8 changes: 8 additions & 0 deletions src/process/CMakeLists.txt
Expand Up @@ -4,6 +4,7 @@
SET(QGIS_PROCESS_SRCS
main.cpp
qgsprocess.cpp
${CMAKE_SOURCE_DIR}/external/nlohmann/json_fwd.hpp
)

IF (UNIX AND NOT ANDROID)
Expand All @@ -23,6 +24,9 @@ INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES(SYSTEM
${QT_INCLUDE_DIR}
${QGIS_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
)

IF (UNIX AND NOT ANDROID)
Expand All @@ -42,6 +46,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/analysis/processing
${CMAKE_SOURCE_DIR}/src/python
${CMAKE_SOURCE_DIR}/external/nlohmann
${CMAKE_SOURCE_DIR}/external

${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/python
Expand All @@ -67,6 +72,9 @@ TARGET_LINK_LIBRARIES(qgis_process
qgis_core
qgis_analysis
${Qt5Core_LIBRARIES}
${PROJ_LIBRARY}
${GEOS_LIBRARY}
${GDAL_LIBRARY}
)

IF (WITH_3D)
Expand Down

0 comments on commit fc8d916

Please sign in to comment.