summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authormwilliammyers <mwilliammyers@gmail.com>2016-07-15 20:19:23 -0600
committermwilliammyers <mwilliammyers@gmail.com>2016-07-20 17:24:40 -0600
commit3fac2dcc4196bf17700fa9d99d5847a85f4b89b0 (patch)
tree3779b27a910b65efa8a3463dd877203be66068fa /var
parent0080ffcf9f3963ee2e8c869139340bf0384377fc (diff)
downloadspack-3fac2dcc4196bf17700fa9d99d5847a85f4b89b0.tar.gz
spack-3fac2dcc4196bf17700fa9d99d5847a85f4b89b0.tar.bz2
spack-3fac2dcc4196bf17700fa9d99d5847a85f4b89b0.tar.xz
spack-3fac2dcc4196bf17700fa9d99d5847a85f4b89b0.zip
opencv : Fix cmake not disabling gtk
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/opencv/package.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py
index 13d57d9163..bc04be8a31 100644
--- a/var/spack/repos/builtin/packages/opencv/package.py
+++ b/var/spack/repos/builtin/packages/opencv/package.py
@@ -87,7 +87,10 @@ class Opencv(Package):
'-DWITH_QT:BOOL=%s' % ('ON' if '+qt' in spec else 'OFF'),
'-DWITH_VTK:BOOL=%s' % ('ON' if '+vtk' in spec else 'OFF')])
- if '^gtkplus@3:' in spec:
+ if '+gtk' not in spec:
+ cmake_options.extend(['-DWITH_GTK:BOOL=OFF',
+ '-DWITH_GTK_2_X:BOOL=OFF'])
+ elif '^gtkplus@3:' in spec:
cmake_options.extend(['-DWITH_GTK:BOOL=ON',
'-DWITH_GTK_2_X:BOOL=OFF'])
elif '^gtkplus@2:3' in spec: