diff options
author | mwilliammyers <mwilliammyers@gmail.com> | 2016-07-18 17:50:54 -0600 |
---|---|---|
committer | mwilliammyers <mwilliammyers@gmail.com> | 2016-07-20 18:10:09 -0600 |
commit | 670157b3647c40c7bf7b6c0d693e1ff2c775acd9 (patch) | |
tree | d55285d29a21fd5290c00cab9076ef08045c7978 /var | |
parent | e5ae48a9da944a3ceda3e314d6502cd289722d7d (diff) | |
download | spack-670157b3647c40c7bf7b6c0d693e1ff2c775acd9.tar.gz spack-670157b3647c40c7bf7b6c0d693e1ff2c775acd9.tar.bz2 spack-670157b3647c40c7bf7b6c0d693e1ff2c775acd9.tar.xz spack-670157b3647c40c7bf7b6c0d693e1ff2c775acd9.zip |
opencv : Add zlib cmake support
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/opencv/package.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index 748de80ccf..cc91627d00 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -100,6 +100,15 @@ class Opencv(Package): 'ON' if '+java' in spec else 'OFF')), ]) + zlib = spec['zlib'] + cmake_options.extend([ + '-DZLIB_LIBRARY_{0}:FILEPATH={1}'.format(( + 'DEBUG' if '+debug' in spec else 'RELEASE'), + join_path(zlib.prefix.lib, + 'libz.{0}'.format(dso_suffix))), + '-DZLIB_INCLUDE_DIR:PATH={0}'.format(zlib.prefix.include) + ]) + libpng = spec['libpng'] cmake_options.extend([ '-DPNG_LIBRARY_{0}:FILEPATH={1}'.format(( |