Skip to content

Commit 2822e39

Browse files
alexbruyalexbruy
committedMay 24, 2017
[processing] support OTB 5.8.0
(cherry picked from commit 3145a01)
·
final-2_18_28final-2_18_10
1 parent 2ea211d commit 2822e39

File tree

286 files changed

+13122
-3
lines changed

Some content is hidden

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

286 files changed

+13122
-3
lines changed
 

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ FiLE(GLOB HELP_FILES description/5.0.0/doc/*.html)
66
FILE(GLOB DESCR_FILES description/5.6.0/*.xml)
77
FiLE(GLOB HELP_FILES description/5.6.0/doc/*.html)
88

9+
FILE(GLOB DESCR_FILES description/5.8.0/*.xml)
10+
FiLE(GLOB HELP_FILES description/5.8.0/doc/*.html)
11+
912
PLUGIN_INSTALL(processing ./algs/otb ${PY_FILES})
1013
PLUGIN_INSTALL(processing ./algs/otb/helper ${HELPER_FILES})
1114

@@ -14,3 +17,6 @@ PLUGIN_INSTALL(processing ./algs/otb/description/5.0.0/doc ${HELP_FILES})
1417

1518
PLUGIN_INSTALL(processing ./algs/otb/description/5.6.0 ${DESCR_FILES})
1619
PLUGIN_INSTALL(processing ./algs/otb/description/5.6.0/doc ${HELP_FILES})
20+
21+
PLUGIN_INSTALL(processing ./algs/otb/description/5.8.0 ${DESCR_FILES})
22+
PLUGIN_INSTALL(processing ./algs/otb/description/5.8.0/doc ${HELP_FILES})

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

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

143143

144144
def compatibleDescriptionPath(version):
145-
supportedVersions = {"5.0.0": "5.0.0", "5.4.0": "5.4.0", "5.6.0": "5.6.0"}
145+
supportedVersions = {"5.0.0": "5.0.0",
146+
"5.4.0": "5.4.0",
147+
"5.6.0": "5.6.0",
148+
"5.8.0": "5.8.0"}
146149
if version is None:
147150
return None
148151
if version not in supportedVersions:

0 commit comments

Comments
 (0)
Please sign in to comment.