fix SEXTANTE things broken by 6ca7ea9

qgis · Oct 25, 2012 · bd4fd28 · bd4fd28
1 parent 0b1ebaa
commit bd4fd28
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/python/plugins/sextante/about/CMakeLists.txt b/python/plugins/sextante/about/CMakeLists.txt
@@ -3,6 +3,4 @@ FILE(GLOB PY_FILES *.py)
 FILE(GLOB UI_FILES *.ui)
 PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES})
 
-
-
 PLUGIN_INSTALL(sextante ./about ${PY_FILES} ${PYUI_FILES})
diff --git a/python/plugins/sextante/ftools/CMakeLists.txt b/python/plugins/sextante/ftools/CMakeLists.txt
@@ -2,4 +2,5 @@ FILE(GLOB PY_FILES *.py)
 FILE(GLOB OTHER_FILES copyright.txt)
 FILE(GLOB ICON_FILES icons/*.png)
 
-PLUGIN_INSTALL(sextante ./ftools ${PY_FILES} ${OTHER_FILES} ${ICON_FILES})
+PLUGIN_INSTALL(sextante ./ftools ${PY_FILES} ${OTHER_FILES})
+PLUGIN_INSTALL(sextante ./ftools/icons ${ICON_FILES})
diff --git a/python/plugins/sextante/gdal/CMakeLists.txt b/python/plugins/sextante/gdal/CMakeLists.txt
@@ -3,4 +3,5 @@ FILE(GLOB ICON_FILES icons/*.png)
 
 ADD_SUBDIRECTORY(scripts)
 
-PLUGIN_INSTALL(sextante ./gdal ${PY_FILES} ${ICON_FILES})
+PLUGIN_INSTALL(sextante ./gdal ${PY_FILES})
+PLUGIN_INSTALL(sextante ./gdal/icons ${ICON_FILES})
diff --git a/python/plugins/sextante/help/CMakeLists.txt b/python/plugins/sextante/help/CMakeLists.txt
@@ -3,4 +3,6 @@ FILE(GLOB OTHER_FILES *.js)
 FILE(GLOB IMAGE_FILES _images/*.*)
 FILE(GLOB STATIC_FILES _static/*.*)
 
-PLUGIN_INSTALL(sextante ./help ${HTML_FILES} ${OTHER_FILES} ${IMAGE_FILES} ${STATIC_FILES})
+PLUGIN_INSTALL(sextante ./help ${HTML_FILES} ${OTHER_FILES})
+PLUGIN_INSTALL(sextante ./help/images ${IMAGE_FILES})
+PLUGIN_INSTALL(sextante ./help/_static ${STATIC_FILES})
diff --git a/python/plugins/sextante/mmqgisx/CMakeLists.txt b/python/plugins/sextante/mmqgisx/CMakeLists.txt
@@ -2,4 +2,5 @@ FILE(GLOB PY_FILES *.py)
 FILE(GLOB OTHER_FILES copyright.txt)
 FILE(GLOB ICON_FILES icons/*.png)
 
-PLUGIN_INSTALL(sextante ./mmqgisx ${PY_FILES} ${OTHER_FILES} ${ICON_FILES})
+PLUGIN_INSTALL(sextante ./mmqgisx ${PY_FILES} ${OTHER_FILES})
+PLUGIN_INSTALL(sextante ./mmqgisx/icons ${ICON_FILES})
diff --git a/python/plugins/sextante/pymorph/html/morph/CMakeLists.txt b/python/plugins/sextante/pymorph/html/morph/CMakeLists.txt
@@ -6,4 +6,9 @@ FILE(GLOB MMINFO_FILES mminfo/*.*)
 FILE(GLOB MMTYPES_FILES mmtype/*.*)
 FILE(GLOB MORPH_FILES morph/*.*)
 
-PLUGIN_INSTALL(sextante ./pymorph/html/morph ${HTML_FILES} ${GIF_FILES} ${IMAGES_FILES} ${MMDEMOS_FILES} ${MMINFO_FILES} ${MMTYPES_FILES} ${MORPH_FILES})
+PLUGIN_INSTALL(sextante ./pymorph/html/morph ${HTML_FILES} ${GIF_FILES})
+PLUGIN_INSTALL(sextante ./pymorph/html/morph/images ${IMAGES_FILES})
+PLUGIN_INSTALL(sextante ./pymorph/html/morph/mmdemos ${MMDEMOS_FILES})
+PLUGIN_INSTALL(sextante ./pymorph/html/morph/mminfo ${MMINFO_FILES})
+PLUGIN_INSTALL(sextante ./pymorph/html/morph/mmtypes ${MMTYPES_FILES})
+PLUGIN_INSTALL(sextante ./pymorph/html/morph/morph ${MORPH_FILES})