Skip to content

Commit

Permalink
[processing] Adapted make files (they were not changed after refactor…
Browse files Browse the repository at this point in the history
…ing folder structure)
  • Loading branch information
volaya committed Apr 20, 2014
1 parent 4e49ad5 commit 25676f3
Show file tree
Hide file tree
Showing 23 changed files with 45 additions and 40 deletions.
10 changes: 0 additions & 10 deletions python/plugins/processing/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
SET (PROCESSING_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/processing)

ADD_SUBDIRECTORY(admintools)
ADD_SUBDIRECTORY(algs)
ADD_SUBDIRECTORY(commander)
ADD_SUBDIRECTORY(core)
ADD_SUBDIRECTORY(gdal)
ADD_SUBDIRECTORY(grass)
ADD_SUBDIRECTORY(grass7)
ADD_SUBDIRECTORY(gui)
ADD_SUBDIRECTORY(images)
ADD_SUBDIRECTORY(lidar)
ADD_SUBDIRECTORY(modeler)
ADD_SUBDIRECTORY(otb)
ADD_SUBDIRECTORY(outputs)
ADD_SUBDIRECTORY(parameters)
ADD_SUBDIRECTORY(r)
ADD_SUBDIRECTORY(saga)
ADD_SUBDIRECTORY(script)
ADD_SUBDIRECTORY(taudem)
ADD_SUBDIRECTORY(tools)
ADD_SUBDIRECTORY(tests)
ADD_SUBDIRECTORY(exampleprovider)
Expand Down
13 changes: 13 additions & 0 deletions python/plugins/processing/algs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FILE(GLOB PY_FILES *.py)

ADD_SUBDIRECTORY(admintools)
ADD_SUBDIRECTORY(gdal)
ADD_SUBDIRECTORY(grass)
ADD_SUBDIRECTORY(grass7)
ADD_SUBDIRECTORY(saga)
ADD_SUBDIRECTORY(otb)
ADD_SUBDIRECTORY(taudem)
ADD_SUBDIRECTORY(lidar)
ADD_SUBDIRECTORY(qgis)

PLUGIN_INSTALL(processing ./algs ${PY_FILES})
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/admintools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ IF(WITH_INTERNAL_HTTPLIB)
ADD_SUBDIRECTORY(httplib2)
ENDIF(WITH_INTERNAL_HTTPLIB)

PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
PLUGIN_INSTALL(processing ./algs/admintools ${PY_FILES})
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(processing ./admintools/geoserver ${PY_FILES})
PLUGIN_INSTALL(processing ./algs/admintools/geoserver ${PY_FILES})
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(processing ./admintools/httplib2 ${PY_FILES})
PLUGIN_INSTALL(processing ./algs/admintools/httplib2 ${PY_FILES})
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/gdal/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ FILE(GLOB ICON_FILES icons/*.png)
ADD_SUBDIRECTORY(scripts)
ADD_SUBDIRECTORY(pyogr)

PLUGIN_INSTALL(processing ./gdal ${PY_FILES})
PLUGIN_INSTALL(processing ./gdal/icons ${ICON_FILES})
PLUGIN_INSTALL(processing ./algs/gdal ${PY_FILES})
PLUGIN_INSTALL(processing ./algs/gdal/icons ${ICON_FILES})
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/pyogr/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(processing ./gdal/pyogr ${PY_FILES})
PLUGIN_INSTALL(processing ./algs/gdal/pyogr ${PY_FILES})
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/scripts/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(processing ./gdal/scripts ${PY_FILES})
PLUGIN_INSTALL(processing ./gdal/algs/scripts ${PY_FILES})
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ FILE(GLOB DESCR_FILES description/*.txt)

ADD_SUBDIRECTORY(ext)

PLUGIN_INSTALL(processing grass ${PY_FILES} ${OTHER_FILES})
PLUGIN_INSTALL(processing grass/description ${DESCR_FILES})
PLUGIN_INSTALL(processing algs/grass ${PY_FILES} ${OTHER_FILES})
PLUGIN_INSTALL(processing algs/grass/description ${DESCR_FILES})
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/grass/ext/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(processing grass/ext ${PY_FILES})
PLUGIN_INSTALL(processing algs/grass/ext ${PY_FILES})
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ FILE(GLOB DESCR_FILES description/*.txt)

ADD_SUBDIRECTORY(ext)

PLUGIN_INSTALL(processing grass7 ${PY_FILES} ${OTHER_FILES})
PLUGIN_INSTALL(processing grass7/description ${DESCR_FILES})
PLUGIN_INSTALL(processing algs/grass7 ${PY_FILES} ${OTHER_FILES})
PLUGIN_INSTALL(processing algs/grass7/description ${DESCR_FILES})
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/grass7/ext/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(processing grass7/ext ${PY_FILES})
PLUGIN_INSTALL(processing algs/grass7/ext ${PY_FILES})
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/lidar/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ FILE(GLOB PY_FILES *.py)
ADD_SUBDIRECTORY(fusion)
ADD_SUBDIRECTORY(lastools)

PLUGIN_INSTALL(processing ./lidar ${PY_FILES})
PLUGIN_INSTALL(processing ./algs/lidar ${PY_FILES})
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/lidar/fusion/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(processing ./lidar/fusion ${PY_FILES})
PLUGIN_INSTALL(processing ./algs/lidar/fusion ${PY_FILES})
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(processing ./lidar/lastools ${PY_FILES})
PLUGIN_INSTALL(processing ./algs/lidar/lastools ${PY_FILES})
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/otb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FILE(GLOB DESCR_FILES description/*.xml)
FILE(GLOB HELPER_FILES helper/*.py)
FiLE(GLOB HELP_FILES description/doc/*.html)

PLUGIN_INSTALL(processing ./otb ${PY_FILES})
PLUGIN_INSTALL(processing ./otb/description ${DESCR_FILES})
PLUGIN_INSTALL(processing ./otb/helper ${HELPER_FILES})
PLUGIN_INSTALL(processing ./otb/description/doc ${HELP_FILES})
PLUGIN_INSTALL(processing ./algs/otb ${PY_FILES})
PLUGIN_INSTALL(processing ./algs/otb/description ${DESCR_FILES})
PLUGIN_INSTALL(processing ./algs/otb/helper ${HELPER_FILES})
PLUGIN_INSTALL(processing ./algs/otb/description/doc ${HELP_FILES})
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/ftools/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FILE(GLOB PY_FILES *.py)
FILE(GLOB OTHER_FILES copyright.txt)

PLUGIN_INSTALL(processing ./algs/ftools ${PY_FILES} ${OTHER_FILES})
PLUGIN_INSTALL(processing ./algs/qgis/ftools ${PY_FILES} ${OTHER_FILES})
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/mmqgisx/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FILE(GLOB PY_FILES *.py)
FILE(GLOB OTHER_FILES copyright.txt)

PLUGIN_INSTALL(processing ./algs/mmqgisx ${PY_FILES} ${OTHER_FILES})
PLUGIN_INSTALL(processing ./algs/qgis/mmqgisx ${PY_FILES} ${OTHER_FILES})

2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/ui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ FILE(GLOB PY_FILES *.py)
FILE(GLOB UI_FILES *.ui)
PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES})

PLUGIN_INSTALL(processing ./algs/ui ${PY_FILES} ${PYUI_FILES})
PLUGIN_INSTALL(processing ./algs/qgis/ui ${PY_FILES} ${PYUI_FILES})
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/r/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FILE(GLOB PY_FILES *.py)
FILE(GLOB SCRIPT_FILES scripts/*.rsx)

PLUGIN_INSTALL(processing r ${PY_FILES})
PLUGIN_INSTALL(processing r/scripts ${SCRIPT_FILES})
PLUGIN_INSTALL(processing algs/r ${PY_FILES})
PLUGIN_INSTALL(processing algs/r/scripts ${SCRIPT_FILES})
6 changes: 4 additions & 2 deletions python/plugins/processing/algs/saga/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FILE(GLOB PY_FILES *.py)
FILE(GLOB DESCR_FILES description/*.txt)
FILE(GLOB HELP_FILES help/*.rst)

ADD_SUBDIRECTORY(ext)

PLUGIN_INSTALL(processing saga ${PY_FILES})
PLUGIN_INSTALL(processing saga/description ${DESCR_FILES})
PLUGIN_INSTALL(processing algs/saga ${PY_FILES})
PLUGIN_INSTALL(processing algs/saga/description ${DESCR_FILES})
PLUGIN_INSTALL(processing algs/saga/help ${HELP_FILES})
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/saga/ext/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(processing saga/ext ${PY_FILES})
PLUGIN_INSTALL(processing algs/saga/ext ${PY_FILES})
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/taudem/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FILE(GLOB PY_FILES *.py)
FILE(GLOB DESCR_FILES description/*.txt)

PLUGIN_INSTALL(processing taudem ${PY_FILES})
PLUGIN_INSTALL(processing taudem/description ${DESCR_FILES})
PLUGIN_INSTALL(processing algs/taudem ${PY_FILES})
PLUGIN_INSTALL(processing algs/taudem/description ${DESCR_FILES})

0 comments on commit 25676f3

Please sign in to comment.