diff options
| author | Corey McNeish <35310375+mcneish1@users.noreply.github.com> | 2018-05-25 22:44:18 -0700 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-05-26 00:44:18 -0500 |
| commit | 7a741e7e082df5e6d34240445564d5c99d6702c3 (patch) | |
| tree | b67c9f8dfdd78184a01f69e1191275d3668c637f | |
| parent | 90d1478f50eb0269720d56f6ec04ebd8cea79a5f (diff) | |
| download | spack-7a741e7e082df5e6d34240445564d5c99d6702c3.tar.gz spack-7a741e7e082df5e6d34240445564d5c99d6702c3.tar.bz2 spack-7a741e7e082df5e6d34240445564d5c99d6702c3.tar.xz spack-7a741e7e082df5e6d34240445564d5c99d6702c3.zip | |
Fix OpenCV JasPer disable (#8287)
The recipe previously did not include -DWITH_JASPER
Other edits:
* BUILD_IPP_IW is BUILD instead of WITH; it was in a different section of the CMakeLists.txt. Move it to the top
* Several options were missing :BOOL, add them
* -DWITH_ZLIB doesn't actually exist as an option, at least in the latest version.
| -rw-r--r-- | var/spack/repos/builtin/packages/opencv/package.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index d493651747..0417ae1b4c 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -180,27 +180,29 @@ class Opencv(CMakePackage): # 3rd party components args.extend([ + '-DBUILD_IPP_IW:BOOL={0}'.format(( + 'ON' if '+ipp_iw' in spec else 'OFF')), '-DWITH_CUDA:BOOL={0}'.format(( 'ON' if '+cuda' in spec else 'OFF')), - '-DWITH_EIGEN={0}'.format(( + '-DWITH_EIGEN:BOOL={0}'.format(( 'ON' if '+eigen' in spec else 'OFF')), '-DWITH_IPP:BOOL={0}'.format(( 'ON' if '+ipp' in spec else 'OFF')), - '-DBUILD_IPP_IW:BOOL={0}'.format(( - 'ON' if '+ipp_iw' in spec else 'OFF')), + '-DWITH_JASPER:BOOL={0}'.format(( + 'ON' if '+jasper' in spec else 'OFF')), '-DWITH_JPEG:BOOL={0}'.format(( 'ON' if '+jpeg' in spec else 'OFF')), - '-DWITH_OPENCL={0}'.format(( + '-DWITH_OPENCL:BOOL={0}'.format(( 'ON' if '+opencl' in spec else 'OFF')), - '-DWITH_OPENCL_SVM={0}'.format(( + '-DWITH_OPENCL_SVM:BOOL={0}'.format(( 'ON' if '+opencl_svm' in spec else 'OFF')), - '-DWITH_OPENCLAMDFFT={0}'.format(( + '-DWITH_OPENCLAMDFFT:BOOL={0}'.format(( 'ON' if '+openclamdfft' in spec else 'OFF')), - '-DWITH_OPENCLAMDBLAS={0}'.format(( + '-DWITH_OPENCLAMDBLAS:BOOL={0}'.format(( 'ON' if '+openclamdblas' in spec else 'OFF')), '-DWITH_OPENMP:BOOL={0}'.format(( 'ON' if '+openmp' in spec else 'OFF')), - '-DWITH_PTHREADS_PF={0}'.format(( + '-DWITH_PTHREADS_PF:BOOL={0}'.format(( 'ON' if '+pthreads_pf' in spec else 'OFF')), '-DWITH_PNG:BOOL={0}'.format(( 'ON' if '+png' in spec else 'OFF')), @@ -210,8 +212,6 @@ class Opencv(CMakePackage): 'ON' if '+tiff' in spec else 'OFF')), '-DWITH_VTK:BOOL={0}'.format(( 'ON' if '+vtk' in spec else 'OFF')), - '-DWITH_ZLIB:BOOL={0}'.format(( - 'ON' if '+zlib' in spec else 'OFF')), ]) # Media I/O |