b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #217668 from bouk/openmvg-arch-generic

Browse source 
openmvg: set target architecture to 'generic'
This commit is contained in:
Nick Cao 2023-02-22 20:18:04 +08:00 committed by GitHub
parent 67a6170dc9 ebc120c155
commit e32259e470
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/applications/science/misc/openmvg/default.nix
View file

@ -4,6 +4,7 @@
, libpng ? null
, eigen ? null
, libtiff ? null
, ceres-solver
, enableShared ? !stdenv.hostPlatform.isStatic
, enableExamples ? false
, enableDocs ? false }:
@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ];
buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ceres-solver ];
nativeBuildInputs = [ cmake pkg-config ];
@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-DOpenMVG_BUILD_EXAMPLES=${if enableExamples then "ON" else "OFF"}"
"-DOpenMVG_BUILD_DOC=${if enableDocs then "ON" else "OFF"}"
"-DTARGET_ARCHITECTURE=generic"
] ++ lib.optional enableShared "-DOpenMVG_BUILD_SHARED=ON";
cmakeDir = "./src";