Commit 2535ed8c authored by Amir MOHAMMADI's avatar Amir MOHAMMADI

Revert "Disable QT"

This reverts commit f75efafd.
parent 3def42d8
......@@ -8,7 +8,7 @@ MACHINE_STR=$(uname -m)
# https://gitlab.kitware.com/cmake/cmake/blob/master/Modules/FindPNG.cmake#L55
ln -s $PREFIX/include/libpng16 $PREFIX/include/libpng
QT="OFF"
QT="5"
V4L="1"
if [ "${SHORT_OS_STR:0:5}" == "Linux" ]; then
......
......@@ -83,12 +83,14 @@ requirements:
- harfbuzz {{ harfbuzz }} # [unix]
- libpng {{ libpng }}
- ffmpeg {{ ffmpeg }} # [not win]
- qt 5.9.* # [not osx and not aarch64 and not ppc64le]
- freetype {{ freetype }}
- glib {{ glib }} # [unix]
run:
- {{ pin_compatible('harfbuzz') }} # [unix]
# Don't depend on python in the run section
# py-opencv will depend on python
- qt 5.9.* # [not osx and not aarch64 and not ppc64le]
# https://github.com/conda-forge/opencv-feedstock/issues/174
# Seems like the OSX ABI has changed between 2.9 and 2.10???
# That or a dependency wasn't merged in
......@@ -105,6 +107,7 @@ test:
- nomkl # [blas_impl == 'openblas']
- cmake
- ninja
- qt 5.9.* # [linux64]
files:
- CMakeLists.txt
- test.cpp
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment