hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

opencv : Fix python include dir for cmake

Browse source
This commit is contained in:
mwilliammyers 2016-07-18 18:53:36 -06:00
parent 670157b364
commit ea9fa81ba5
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
var/spack/repos/builtin/packages/opencv/package.py
View file

@ -162,17 +162,26 @@ def install(self, spec, prefix):
if '+python' in spec: if '+python' in spec:
python = spec['python'] python = spec['python']
try: 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: except KeyError:
raise InstallError('Cannot find libpython') 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: if '^python@3:' in spec:
python_exe = join_path(python.prefix.bin, 'python3') python_exe = join_path(python.prefix.bin, 'python3')
cmake_options.extend([ cmake_options.extend([
'-DBUILD_opencv_python3=ON', '-DBUILD_opencv_python3=ON',
'-DPYTHON3_EXECUTABLE={0}'.format(python_exe), '-DPYTHON3_EXECUTABLE={0}'.format(python_exe),
'-DPYTHON3_LIBRARY={0}'.format(python_lib), '-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', '-DBUILD_opencv_python2=OFF',
]) ])
elif '^python@2:3' in spec: elif '^python@2:3' in spec:
@ -182,7 +191,7 @@ def install(self, spec, prefix):
'-DBUILD_opencv_python2=ON', '-DBUILD_opencv_python2=ON',
'-DPYTHON2_EXECUTABLE={0}'.format(python_exe), '-DPYTHON2_EXECUTABLE={0}'.format(python_exe),
'-DPYTHON2_LIBRARY={0}'.format(python_lib), '-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', '-DBUILD_opencv_python3=OFF',
]) ])
else: else: