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

Merge pull request #36170 from LumiGuide/feat-opencv-tbb

Browse Source 
opencv: flag to enable tbb
This commit is contained in:
Joachim F 2018-03-04 22:59:36 +00:00 committed by GitHub
commit 28b48fd8ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
, enableFfmpeg ? false, ffmpeg , enableFfmpeg ? false, ffmpeg
, enableGStreamer ? false, gst_all_1 , enableGStreamer ? false, gst_all_1
, enableTesseract ? false, tesseract, leptonica , enableTesseract ? false, tesseract, leptonica
, enableTbb ? false, tbb
, enableOvis ? false, ogre , enableOvis ? false, ogre
, enableGPhoto2 ? false, libgphoto2 , enableGPhoto2 ? false, libgphoto2
, enableDC1394 ? false, libdc1394 , enableDC1394 ? false, libdc1394
@ -203,6 +204,7 @@ stdenv.mkDerivation rec {
# simply enabled automatically if contrib is built, and it detects # simply enabled automatically if contrib is built, and it detects
# tesseract & leptonica. # tesseract & leptonica.
++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb
++ lib.optional enableCuda cudatoolkit ++ lib.optional enableCuda cudatoolkit
++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ] ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ]; ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
@ -233,6 +235,7 @@ stdenv.mkDerivation rec {
(opencvFlag "OPENEXR" enableEXR) (opencvFlag "OPENEXR" enableEXR)
(opencvFlag "CUDA" enableCuda) (opencvFlag "CUDA" enableCuda)
(opencvFlag "CUBLAS" enableCuda) (opencvFlag "CUBLAS" enableCuda)
(opencvFlag "TBB" enableTbb)
] ++ lib.optionals enableCuda [ ] ++ lib.optionals enableCuda [
"-DCUDA_FAST_MATH=ON" "-DCUDA_FAST_MATH=ON"
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"