Skip to content

Commit 3145a01

Browse files
alexbruyalexbruy
committedJan 10, 2017
[processing] support OTB 5.8.0
1 parent 9909109 commit 3145a01

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
@@ -9,6 +9,9 @@ FiLE(GLOB HELP_FILES description/5.4.0/doc/*.html)
99
FILE(GLOB DESCR_FILES description/5.6.0/*.xml)
1010
FiLE(GLOB HELP_FILES description/5.6.0/doc/*.html)
1111

12+
FILE(GLOB DESCR_FILES description/5.8.0/*.xml)
13+
FiLE(GLOB HELP_FILES description/5.8.0/doc/*.html)
14+
1215
PLUGIN_INSTALL(processing ./algs/otb ${PY_FILES})
1316
PLUGIN_INSTALL(processing ./algs/otb/helper ${HELPER_FILES})
1417

@@ -20,3 +23,6 @@ PLUGIN_INSTALL(processing ./algs/otb/description/5.4.0/doc ${HELP_FILES})
2023

2124
PLUGIN_INSTALL(processing ./algs/otb/description/5.6.0 ${DESCR_FILES})
2225
PLUGIN_INSTALL(processing ./algs/otb/description/5.6.0/doc ${HELP_FILES})
26+
27+
PLUGIN_INSTALL(processing ./algs/otb/description/5.8.0 ${DESCR_FILES})
28+
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
@@ -143,7 +143,10 @@ def getInstalledVersion(runOtb=False):
143143

144144

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

0 commit comments

Comments
 (0)