Merge branch 'master' of http://192.168.10.5:8099/sane/code_app

build2/qt/HGImgProc/HGImgProc.pro

@@ -107,7 +107,9 @@ unix {
         LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_imgproc.a
         LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libopencv_core.a
         LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libittnotify.a
-        LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libtegra_hal.a
+        !contains(DISTRIBUTION, UnionTech) {
+            LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libtegra_hal.a
+        }
         LIBS += $$PWD/../../../third_party/opencv/$${MY_OS}/$${MY_ARCH}/lib/libzlib.a
     }
     contains(QT_ARCH, mips64) {

third_party/leptonica/src/CMakeLists.txt

@@ -130,9 +130,10 @@ add_definitions(-DHAVE_CONFIG_H)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
-include_directories(/home/luoliangyi/sane/code_app/third_party/libjpeg/kylin/amd64/include)
-include_directories(/home/luoliangyi/sane/code_app/third_party/libpng/kylin/amd64/include/libpng16)
-include_directories(/home/luoliangyi/sane/code_app/third_party/libtiff/kylin/amd64/include)
+include_directories(/home/huagao/sane/code_app/third_party/libjpeg/kylin/amd64/include)
+include_directories(/home/huagao/sane/code_app/third_party/libpng/kylin/amd64/include/libpng16)
+include_directories(/home/huagao/sane/code_app/third_party/libtiff/kylin/amd64/include)
+include_directories(/home/huagao/sane/code_app/third_party/zlib/kylin/amd64/include)
 
 if (BUILD_PROG)
 add_subdirectory(prog)