Unverified Commit 9372af56 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #286053 from expenses/opensubdiv-metal 

opensubdiv: add Metal support
parents cbff16ce c174d176

pkgs/development/libraries/opensubdiv/default.nix

+12 −4
Original line number Diff line number Diff line
@@ -31,9 +31,17 @@ stdenv.mkDerivation rec { 
      glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor

      xorg.libXinerama xorg.libXi

    ]

    ++ lib.optional (openclSupport && !stdenv.isDarwin) ocl-icd

    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [OpenCL Cocoa CoreVideo IOKit AppKit AGL ])

    ++ lib.optional cudaSupport [

    ++ lib.optionals (openclSupport && !stdenv.isDarwin) [ ocl-icd ]

    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

      OpenCL

      Cocoa

      CoreVideo

      IOKit

      AppKit

      AGL

      MetalKit

    ])

    ++ lib.optionals cudaSupport [

      cudaPackages.cuda_cudart

    ];
@@ -50,7 +58,7 @@ stdenv.mkDerivation rec { 
    [ "-DNO_TUTORIALS=1"

      "-DNO_REGRESSION=1"

      "-DNO_EXAMPLES=1"

      "-DNO_METAL=1" # don’t have metal in apple sdk

      (lib.cmakeBool "NO_METAL" (!stdenv.isDarwin))

      (lib.cmakeBool "NO_OPENCL" (!openclSupport))

      (lib.cmakeBool "NO_CUDA" (!cudaSupport))

    ] ++ lib.optionals (!stdenv.isDarwin) [