718c41634f
1.项目后端整体迁移至PaddleOCR-NCNN算法，已通过基本的兼容性测试 2.工程改为使用CMake组织，后续为了更好地兼容第三方库，不再提供QMake工程 3.重整权利声明文件，重整代码工程，确保最小化侵权风险 Log: 切换后端至PaddleOCR-NCNN，切换工程为CMake Change-Id: I4d5d2c5d37505a4a24b389b1a4c5d12f17bfa38c
12 lines
707 B
Diff
12 lines
707 B
Diff
diff -Nuarp opencv-2.4.13.7/cmake/OpenCVCompilerOptions.cmake opencv-2.4.13.7.no-link-stdc++/cmake/OpenCVCompilerOptions.cmake
|
|
--- opencv-2.4.13.7/cmake/OpenCVCompilerOptions.cmake 2018-07-02 05:41:56.000000000 +0800
|
|
+++ opencv-2.4.13.7.no-link-stdc++/cmake/OpenCVCompilerOptions.cmake 2021-05-11 15:57:17.159970391 +0800
|
|
@@ -313,7 +313,6 @@ endif()
|
|
# Extra link libs if the user selects building static libs:
|
|
if(NOT BUILD_SHARED_LIBS AND ((CMAKE_COMPILER_IS_GNUCXX AND NOT ANDROID) OR QNX))
|
|
# Android does not need these settings because they are already set by toolchain file
|
|
- set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)
|
|
set(OPENCV_EXTRA_FLAGS "-fPIC ${OPENCV_EXTRA_FLAGS}")
|
|
endif()
|
|
|