diff options
| author | mwilliammyers <mwilliammyers@gmail.com> | 2016-07-15 20:21:26 -0600 |
|---|---|---|
| committer | mwilliammyers <mwilliammyers@gmail.com> | 2016-07-20 17:24:46 -0600 |
| commit | c588ce9648766cfd40834aa2131caed9536988ee (patch) | |
| tree | 3a9392673dd7d42630d50b687ed3b3ee6c233acc /var | |
| parent | 3fac2dcc4196bf17700fa9d99d5847a85f4b89b0 (diff) | |
| download | spack-c588ce9648766cfd40834aa2131caed9536988ee.tar.gz spack-c588ce9648766cfd40834aa2131caed9536988ee.tar.bz2 spack-c588ce9648766cfd40834aa2131caed9536988ee.tar.xz spack-c588ce9648766cfd40834aa2131caed9536988ee.zip | |
opencv : Improve cmake detecting python
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/opencv/package.py | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index bc04be8a31..02237a0efc 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -97,18 +97,31 @@ class Opencv(Package): cmake_options.extend(['-DWITH_GTK:BOOL=OFF', '-DWITH_GTK_2_X:BOOL=ON']) - python_prefix = spec['python'].prefix - python_lib = python_prefix.lib + python = spec['python'] if '^python@3:' in spec: - python = join_path(python_prefix.bin, 'python3') - cmake_options.extend(['-DBUILD_opencv_python3=ON', - '-DPYTHON_EXECUTABLE=%s' % python, - '-DPYTHON_LIBRARIES=%s' % python_lib]) + python_exe = join_path(python.prefix.bin, 'python3') + cmake_options.extend([ + '-DBUILD_opencv_python3=ON', + '-DPYTHON3_EXECUTABLE=%s' % python_exe, + '-DPYTHON3_LIBRARIES=%s' % python.prefix.lib, + '-DPYTHON3_INCLUDE_DIR=%s' % python.prefix.include, + '-DBUILD_opencv_python2=OFF', + '-DPYTHON2_EXECUTABLE=', + '-DPYTHON2_LIBRARIES=', + '-DPYTHON2_INCLUDE_DIR=', + ]) elif '^python@2:3' in spec: - python = join_path(python_prefix.bin, 'python2') - cmake_options.extend(['-DBUILD_opencv_python2=ON', - '-DPYTHON_EXECUTABLE=%s' % python, - '-DPYTHON_LIBRARIES=%s' % python_lib]) + python_exe = join_path(python.prefix.bin, 'python2') + cmake_options.extend([ + '-DBUILD_opencv_python2=ON', + '-DPYTHON2_EXECUTABLE=%s' % python_exe, + '-DPYTHON2_LIBRARIES=%s' % python.prefix.lib, + '-DPYTHON2_INCLUDE_DIR=%s' % python.prefix.include, + '-DBUILD_opencv_python3=OFF', + '-DPYTHON3_EXECUTABLE=', + '-DPYTHON3_LIBRARIES=', + '-DPYTHON3_INCLUDE_DIR=', + ]) with working_dir('spack_build', create=True): cmake('..', *cmake_options) |