Skip to content

Commit 10f72cd

Browse files
committedAug 23, 2016
Merge branch 'otb_apps_export_improvment' of https://github.com/grizonnetm/QGIS into otb_apps_export_improvment
2 parents 3251ece + ce0a2ae commit 10f72cd

File tree

288 files changed

+13117
-16
lines changed

Some content is hidden

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

288 files changed

+13117
-16
lines changed
 

‎python/plugins/processing/algs/otb/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@ FILE(GLOB HELPER_FILES helper/*.py)
33
FILE(GLOB DESCR_FILES description/5.0.0/*.xml)
44
FiLE(GLOB HELP_FILES description/5.0.0/doc/*.html)
55

6+
FILE(GLOB DESCR_FILES description/5.6.0/*.xml)
7+
FiLE(GLOB HELP_FILES description/5.6.0/doc/*.html)
8+
69
PLUGIN_INSTALL(processing ./algs/otb ${PY_FILES})
710
PLUGIN_INSTALL(processing ./algs/otb/helper ${HELPER_FILES})
11+
812
PLUGIN_INSTALL(processing ./algs/otb/description/5.0.0 ${DESCR_FILES})
913
PLUGIN_INSTALL(processing ./algs/otb/description/5.0.0/doc ${HELP_FILES})
14+
15+
PLUGIN_INSTALL(processing ./algs/otb/description/5.6.0 ${DESCR_FILES})
16+
PLUGIN_INSTALL(processing ./algs/otb/description/5.6.0/doc ${HELP_FILES})

‎python/plugins/processing/algs/otb/OTBUtils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def getInstalledVersion(runOtb=False):
142142

143143

144144
def compatibleDescriptionPath(version):
145-
supportedVersions = {"5.0.0": "5.0.0"}
145+
supportedVersions = {"5.0.0": "5.0.0", "5.6.0": "5.6.0"}
146146
if version is None:
147147
return None
148148
if version not in supportedVersions:

0 commit comments

Comments
 (0)
Please sign in to comment.