public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26733 from juliendehos/opencv

Browse Source 
opencv: add openblas support
This commit is contained in:
Jörg Thalheim 2017-06-25 10:41:46 +01:00 committed by GitHub
commit 4ef00cab4e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/opencv/3.x.nix
View File

@ -15,6 +15,7 @@
, enableFfmpeg ? false, ffmpeg , enableFfmpeg ? false, ffmpeg
, enableGStreamer ? false, gst_all_1 , enableGStreamer ? false, gst_all_1
, enableEigen ? false, eigen , enableEigen ? false, eigen
, enableOpenblas ? false, openblas
, enableCuda ? false, cudatoolkit, gcc5 , enableCuda ? false, cudatoolkit, gcc5
, AVFoundation, Cocoa, QTKit , AVFoundation, Cocoa, QTKit
}: }:
@ -130,6 +131,7 @@ stdenv.mkDerivation rec {
++ lib.optional enableFfmpeg ffmpeg ++ lib.optional enableFfmpeg ffmpeg
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional enableEigen eigen ++ lib.optional enableEigen eigen
++ lib.optional enableOpenblas openblas
++ lib.optionals enableCuda [ cudatoolkit gcc5 ] ++ lib.optionals enableCuda [ cudatoolkit gcc5 ]
++ lib.optional enableContrib protobuf3_1 ++ lib.optional enableContrib protobuf3_1
++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ]; ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ];
@ -141,7 +143,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR";
cmakeFlags = [ cmakeFlags = [
"-DWITH_IPP=${if enableIpp then "ON" else "OFF"}" "-DWITH_IPP=${if enableIpp then "ON" else "OFF"} -DWITH_OPENMP=ON"
(opencvFlag "TIFF" enableTIFF) (opencvFlag "TIFF" enableTIFF)
(opencvFlag "JASPER" enableJPEG2K) (opencvFlag "JASPER" enableJPEG2K)
(opencvFlag "WEBP" enableWebP) (opencvFlag "WEBP" enableWebP)