diff options
| author | mwilliammyers <mwilliammyers@gmail.com> | 2016-07-18 14:45:34 -0600 |
|---|---|---|
| committer | mwilliammyers <mwilliammyers@gmail.com> | 2016-07-20 17:25:05 -0600 |
| commit | da2b695f9387c2d7b0345c26efa7ce0c4d75df58 (patch) | |
| tree | d3e4b06a4f165b311fccf4089fa4019e7ea5cdc8 /var | |
| parent | 10c285a774c3218c952f30605b960212bf8dd302 (diff) | |
| download | spack-da2b695f9387c2d7b0345c26efa7ce0c4d75df58.tar.gz spack-da2b695f9387c2d7b0345c26efa7ce0c4d75df58.tar.bz2 spack-da2b695f9387c2d7b0345c26efa7ce0c4d75df58.tar.xz spack-da2b695f9387c2d7b0345c26efa7ce0c4d75df58.zip | |
opencv : Fix lib finding for python
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/opencv/package.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index bbec27054e..89bb97039f 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -112,29 +112,28 @@ class Opencv(Package): if '+python' in spec: python = spec['python'] + try: + python_lib = glob(join_path(python.prefix.lib, 'libpython*.so'))[0] + except KeyError: + raise InstallError('Cannot find libpython') if '^python@3:' in spec: python_exe = join_path(python.prefix.bin, 'python3') cmake_options.extend([ '-DBUILD_opencv_python3=ON', '-DPYTHON3_EXECUTABLE={0}'.format(python_exe), - '-DPYTHON3_LIBRARIES={0}'.format(python.prefix.lib), + '-DPYTHON3_LIBRARY={0}'.format(python_lib), '-DPYTHON3_INCLUDE_DIR={0}'.format(python.prefix.include), '-DBUILD_opencv_python2=OFF', - '-DPYTHON2_EXECUTABLE=', - '-DPYTHON2_LIBRARIES=', - '-DPYTHON2_INCLUDE_DIR=', ]) elif '^python@2:3' in spec: python_exe = join_path(python.prefix.bin, 'python2') + python_lib = glob(join_path(python.prefix.lib, '*.so')) cmake_options.extend([ '-DBUILD_opencv_python2=ON', '-DPYTHON2_EXECUTABLE={0}'.format(python_exe), - '-DPYTHON2_LIBRARIES={0}'.format(python.prefix.lib), + '-DPYTHON2_LIBRARY={0}'.format(python_lib), '-DPYTHON2_INCLUDE_DIR={0}'.format(python.prefix.include), '-DBUILD_opencv_python3=OFF', - '-DPYTHON3_EXECUTABLE=', - '-DPYTHON3_LIBRARIES=', - '-DPYTHON3_INCLUDE_DIR=', ]) else: cmake_options.extend([ |