zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Opencv fix (#5040)

Browse Source 
* Added a package for the MDAnalysis toolkit.

* Changed cmake_options to args to be consistent with the rest of the
file and fix a cmake error about undefined errors.  Additionally,
added guards for both png and zlib to not include their cmake options
when those variants are not specified.
This commit is contained in:
Brian Van Essen 2017-08-09 13:40:10 -07:00 committed by Adam J. Stewart
parent 0137f17306
commit 28b0421eb1
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
var/spack/repos/builtin/packages/opencv/package.py
View File

@ -128,27 +128,29 @@ def cmake_args(self):
] ]
# Media I/O # Media I/O
zlib = spec['zlib'] if '+zlib' in spec:
args.extend([ zlib = spec['zlib']
'-DZLIB_LIBRARY_{0}:FILEPATH={1}'.format(( args.extend([
'DEBUG' if '+debug' in spec else 'RELEASE'), '-DZLIB_LIBRARY_{0}:FILEPATH={1}'.format((
join_path(zlib.prefix.lib, 'DEBUG' if '+debug' in spec else 'RELEASE'),
'libz.{0}'.format(dso_suffix))), join_path(zlib.prefix.lib,
'-DZLIB_INCLUDE_DIR:PATH={0}'.format(zlib.prefix.include) 'libz.{0}'.format(dso_suffix))),
]) '-DZLIB_INCLUDE_DIR:PATH={0}'.format(zlib.prefix.include)
])
libpng = spec['libpng'] if '+png' in spec:
args.extend([ libpng = spec['libpng']
'-DPNG_LIBRARY_{0}:FILEPATH={1}'.format(( args.extend([
'DEBUG' if '+debug' in spec else 'RELEASE'), '-DPNG_LIBRARY_{0}:FILEPATH={1}'.format((
join_path(libpng.prefix.lib, 'DEBUG' if '+debug' in spec else 'RELEASE'),
'libpng.{0}'.format(dso_suffix))), join_path(libpng.prefix.lib,
'-DPNG_INCLUDE_DIR:PATH={0}'.format(libpng.prefix.include) 'libpng.{0}'.format(dso_suffix))),
]) '-DPNG_INCLUDE_DIR:PATH={0}'.format(libpng.prefix.include)
])
if '+jpeg' in spec: if '+jpeg' in spec:
libjpeg = spec['libjpeg-turbo'] libjpeg = spec['libjpeg-turbo']
cmake_options.extend([ args.extend([
'-DBUILD_JPEG:BOOL=OFF', '-DBUILD_JPEG:BOOL=OFF',
'-DJPEG_LIBRARY:FILEPATH={0}'.format( '-DJPEG_LIBRARY:FILEPATH={0}'.format(
join_path(libjpeg.prefix.lib, join_path(libjpeg.prefix.lib,
@ -158,7 +160,7 @@ def cmake_args(self):
if '+tiff' in spec: if '+tiff' in spec:
libtiff = spec['libtiff'] libtiff = spec['libtiff']
cmake_options.extend([ args.extend([
'-DTIFF_LIBRARY_{0}:FILEPATH={1}'.format(( '-DTIFF_LIBRARY_{0}:FILEPATH={1}'.format((
'DEBUG' if '+debug' in spec else 'RELEASE'), 'DEBUG' if '+debug' in spec else 'RELEASE'),
join_path(libtiff.prefix.lib, join_path(libtiff.prefix.lib,
@ -168,7 +170,7 @@ def cmake_args(self):
if '+jasper' in spec: if '+jasper' in spec:
jasper = spec['jasper'] jasper = spec['jasper']
cmake_options.extend([ args.extend([
'-DJASPER_LIBRARY_{0}:FILEPATH={1}'.format(( '-DJASPER_LIBRARY_{0}:FILEPATH={1}'.format((
'DEBUG' if '+debug' in spec else 'RELEASE'), 'DEBUG' if '+debug' in spec else 'RELEASE'),
join_path(jasper.prefix.lib, join_path(jasper.prefix.lib,