Salome HOME
projects
/
tools
/
sat_salome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the GEOM patch related to opencv on CO6 - finally fixed in its sources
[tools/sat_salome.git]
/
applications
/
SALOME-master.pyconf
diff --git
a/applications/SALOME-master.pyconf
b/applications/SALOME-master.pyconf
index 066063cd5f906351cce1125af097c0143f783ab9..b2bb7ff435411da21bd14f5769133f8fbda5132e 100644
(file)
--- a/
applications/SALOME-master.pyconf
+++ b/
applications/SALOME-master.pyconf
@@
-179,8
+179,6
@@
__overwrite__ :
# GTK compilation issue
__condition__ : "VARS.dist in ['CO6']"
'APPLICATION.products.opencv' : '2.4.13.5'
# GTK compilation issue
__condition__ : "VARS.dist in ['CO6']"
'APPLICATION.products.opencv' : '2.4.13.5'
- # Since OpenCV 4.X support, we need additional includes for old 2.X versions
- 'PRODUCTS.GEOM.default.patches' : ['opencv_backward_compatibility.patch']
'APPLICATION.products.tbb' : '4.4'
'APPLICATION.products.llvm' : '3.9.1-clang'
'APPLICATION.products.mesa' : '13.0.6'
'APPLICATION.products.tbb' : '4.4'
'APPLICATION.products.llvm' : '3.9.1-clang'
'APPLICATION.products.mesa' : '13.0.6'