Commite42c4e9

authored

Merge pull request#1123 from asmorkalov:as/no_msmf_win_headless

Disabled Orbbec backend on Windows in headless configuration as it uses MSMF API too

2 parentsfa742a4 +609ff9b commite42c4e9Copy full SHA for e42c4e9

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -214,10 +214,10 @@ def main():`
`214`	`214`	`cmake_args.append("-DWITH_WIN32UI=OFF")`
`215`	`215`	`cmake_args.append("-DWITH_QT=OFF")`
`216`	`216`	`cmake_args.append("-DWITH_GTK=OFF")`
`217`		`-ifis_CI_build:`
`218`		`-cmake_args.append(`
`219`		`-"-DWITH_MSMF=OFF"`
`220`		`- )# see: https://github.com/skvark/opencv-python/issues/263`
	`217`	`+# see: https://github.com/skvark/opencv-python/issues/263`
	`218`	`+# see: https://github.com/opencv/opencv-python/issues/771`
	`219`	`+cmake_args.append("-DWITH_MSMF=OFF")`
	`220`	`+cmake_args.append("-DWITH_OBSENSOR=OFF")# Orbbec cameras backend uses MSMF API`
`221`	`221`
`222`	`222`	`ifsys.platform.startswith("linux")andnotis64and"bdist_wheel"insys.argv:`
`223`	`223`	`subprocess.check_call("patch -p0 < patches/patchOpenEXR",shell=True)`

Comments

(0)