Merge pull request #251355 from emilylange/unbreak-onnxruntime
[staging-next] onnxruntime: fix building with new re2 version
This commit is contained in:
commit
f7c1492781
|
@ -132,6 +132,7 @@ stdenv.mkDerivation rec {
|
||||||
cmakeDir = "../cmake";
|
cmakeDir = "../cmake";
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
"-DABSL_ENABLE_INSTALL=ON"
|
||||||
"-DCMAKE_BUILD_TYPE=RELEASE"
|
"-DCMAKE_BUILD_TYPE=RELEASE"
|
||||||
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
|
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
|
||||||
"-DFETCHCONTENT_QUIET=OFF"
|
"-DFETCHCONTENT_QUIET=OFF"
|
||||||
|
@ -143,6 +144,7 @@ stdenv.mkDerivation rec {
|
||||||
"-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}"
|
"-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}"
|
||||||
"-DFETCHCONTENT_SOURCE_DIR_ONNX=${python3Packages.onnx.src}"
|
"-DFETCHCONTENT_SOURCE_DIR_ONNX=${python3Packages.onnx.src}"
|
||||||
"-DFETCHCONTENT_SOURCE_DIR_PYTORCH_CPUINFO=${pytorch_cpuinfo}"
|
"-DFETCHCONTENT_SOURCE_DIR_PYTORCH_CPUINFO=${pytorch_cpuinfo}"
|
||||||
|
"-DFETCHCONTENT_SOURCE_DIR_RE2=${re2.src}"
|
||||||
"-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}"
|
"-DFETCHCONTENT_SOURCE_DIR_SAFEINT=${safeint}"
|
||||||
"-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS"
|
"-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS"
|
||||||
"-Donnxruntime_BUILD_SHARED_LIB=ON"
|
"-Donnxruntime_BUILD_SHARED_LIB=ON"
|
||||||
|
|
Loading…
Reference in a new issue