diff options
| author | mwilliammyers <mwilliammyers@gmail.com> | 2016-07-18 18:53:36 -0600 |
|---|---|---|
| committer | mwilliammyers <mwilliammyers@gmail.com> | 2016-07-20 18:10:09 -0600 |
| commit | ea9fa81ba5b8a8b9211d129e9bad5b5c146f5ad1 (patch) | |
| tree | 927cf23805bf941c6a5969b994e06c325f848904 /var | |
| parent | 670157b3647c40c7bf7b6c0d693e1ff2c775acd9 (diff) | |
| download | spack-ea9fa81ba5b8a8b9211d129e9bad5b5c146f5ad1.tar.gz spack-ea9fa81ba5b8a8b9211d129e9bad5b5c146f5ad1.tar.bz2 spack-ea9fa81ba5b8a8b9211d129e9bad5b5c146f5ad1.tar.xz spack-ea9fa81ba5b8a8b9211d129e9bad5b5c146f5ad1.zip | |
opencv : Fix python include dir for cmake
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/opencv/package.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index cc91627d00..8e5725d43c 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -162,17 +162,26 @@ class Opencv(Package): if '+python' in spec: python = spec['python'] + try: - python_lib = glob(join_path(python.prefix.lib, 'libpython*.so'))[0] + python_lib = glob(join_path(python.prefix.lib, + 'libpython*.so'))[0] except KeyError: raise InstallError('Cannot find libpython') + + try: + python_include_dir = glob(join_path(python.prefix.include, + 'python*'))[0] + except KeyError: + raise InstallError('Cannot find python include directory') + 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_LIBRARY={0}'.format(python_lib), - '-DPYTHON3_INCLUDE_DIR={0}'.format(python.prefix.include), + '-DPYTHON3_INCLUDE_DIR={0}'.format(python_include_dir), '-DBUILD_opencv_python2=OFF', ]) elif '^python@2:3' in spec: @@ -182,7 +191,7 @@ class Opencv(Package): '-DBUILD_opencv_python2=ON', '-DPYTHON2_EXECUTABLE={0}'.format(python_exe), '-DPYTHON2_LIBRARY={0}'.format(python_lib), - '-DPYTHON2_INCLUDE_DIR={0}'.format(python.prefix.include), + '-DPYTHON2_INCLUDE_DIR={0}'.format(python_include_dir), '-DBUILD_opencv_python3=OFF', ]) else: |