Commit 06c8c825 authored by Thiago Santini's avatar Thiago Santini

Merge remote-tracking branch 'private/linux'

parents 5e6756ed 22c8ef02
......@@ -78,24 +78,26 @@ RESOURCES += \
$${TOP}/resources.qrc
INCLUDEPATH += "$${TOP}/src"
unix{
LIBS += "-L$${TOP}/deps/runtime/x86_64-linux-gnu/"
}
Debug:DBG_SUFFIX = "d"
#OPENCVPATH="D:/opencv/opencv/build/install"
OPENCVPATH="$${TOP}/deps/opencv-3.2.0"
INCLUDEPATH += $${OPENCVPATH}/include/
CV_SUFFIX=320$${DBG_SUFFIX}
win32:CV_SUFFIX=320$${DBG_SUFFIX}
unix:CV_SUFFIX=$${DBG_SUFFIX}
win32:contains(QMAKE_HOST.arch, x86_64) {
LIBS += "-L$${OPENCVPATH}/x64/vc14/lib/"
} else {
LIBS += "-L$${OPENCVPATH}/x86/vc14/lib/"
}
unix{
LIBS += "-L$${OPENCVPATH}/lib/"
}
LIBS += \
-lopencv_calib3d$${CV_SUFFIX} \
-lopencv_core$${CV_SUFFIX} \
-lopencv_features2d$${CV_SUFFIX} \
-lopencv_flann$${CV_SUFFIX} \
-lopencv_highgui$${CV_SUFFIX} \
-lopencv_imgcodecs$${CV_SUFFIX} \
-lopencv_imgproc$${CV_SUFFIX} \
......@@ -146,6 +148,13 @@ win32{
export(copydata.commands)
QMAKE_EXTRA_TARGETS += first copydata
}
unix{
copydata.commands = $(COPY_DIR) $$PWD/deps/runtime/x86_64-linux-gnu/plugins $$OUT_PWD
first.depends = $(first) copydata
export(first.depends)
export(copydata.commands)
QMAKE_EXTRA_TARGETS += first copydata
}
system("git --version"):{
GIT_VERSION=$$system(git --git-dir $${TOP}/../.git --work-tree $$TOP describe --always --tags)
......
libopencv_aruco.so.3.2
\ No newline at end of file
libopencv_aruco.so.3.2.0
\ No newline at end of file
libopencv_bgsegm.so.3.2
\ No newline at end of file
libopencv_bgsegm.so.3.2.0
\ No newline at end of file
libopencv_bioinspired.so.3.2
\ No newline at end of file
libopencv_bioinspired.so.3.2.0
\ No newline at end of file
libopencv_calib3d.so.3.2
\ No newline at end of file
libopencv_calib3d.so.3.2.0
\ No newline at end of file
libopencv_ccalib.so.3.2
\ No newline at end of file
libopencv_ccalib.so.3.2.0
\ No newline at end of file
libopencv_core.so.3.2
\ No newline at end of file
libopencv_core.so.3.2.0
\ No newline at end of file
libopencv_datasets.so.3.2
\ No newline at end of file
libopencv_datasets.so.3.2.0
\ No newline at end of file
libopencv_dnn.so.3.2
\ No newline at end of file
libopencv_dnn.so.3.2.0
\ No newline at end of file
libopencv_dpm.so.3.2
\ No newline at end of file
libopencv_dpm.so.3.2.0
\ No newline at end of file
libopencv_face.so.3.2
\ No newline at end of file
libopencv_face.so.3.2.0
\ No newline at end of file
libopencv_features2d.so.3.2
\ No newline at end of file
libopencv_features2d.so.3.2.0
\ No newline at end of file
libopencv_flann.so.3.2
\ No newline at end of file
libopencv_flann.so.3.2.0
\ No newline at end of file
libopencv_freetype.so.3.2
\ No newline at end of file
libopencv_freetype.so.3.2.0
\ No newline at end of file
libopencv_fuzzy.so.3.2
\ No newline at end of file
libopencv_fuzzy.so.3.2.0
\ No newline at end of file
libopencv_highgui.so.3.2
\ No newline at end of file
libopencv_highgui.so.3.2.0
\ No newline at end of file
libopencv_imgcodecs.so.3.2
\ No newline at end of file
libopencv_imgcodecs.so.3.2.0
\ No newline at end of file
libopencv_imgproc.so.3.2
\ No newline at end of file
libopencv_imgproc.so.3.2.0
\ No newline at end of file
libopencv_line_descriptor.so.3.2
\ No newline at end of file
libopencv_line_descriptor.so.3.2.0
\ No newline at end of file
libopencv_ml.so.3.2
\ No newline at end of file
libopencv_ml.so.3.2.0
\ No newline at end of file
libopencv_objdetect.so.3.2
\ No newline at end of file
libopencv_objdetect.so.3.2.0
\ No newline at end of file
libopencv_optflow.so.3.2
\ No newline at end of file
libopencv_optflow.so.3.2.0
\ No newline at end of file
libopencv_phase_unwrapping.so.3.2
\ No newline at end of file
libopencv_phase_unwrapping.so.3.2.0
\ No newline at end of file
libopencv_photo.so.3.2
\ No newline at end of file
libopencv_photo.so.3.2.0
\ No newline at end of file
libopencv_plot.so.3.2
\ No newline at end of file
libopencv_plot.so.3.2.0
\ No newline at end of file
libopencv_reg.so.3.2
\ No newline at end of file
libopencv_reg.so.3.2.0
\ No newline at end of file
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