Skip to content

Commit d688099

Browse files
committed
Patch OpenCV on Linux to fix invalid syntax
1 parent 729cd46 commit d688099

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

deps/build-deps-linux.sh

+1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ mkdir -p $BASEDIR/opencv
9191
tar -xzf $SRCDIR/opencv-3.2.0.tar.gz -C $BASEDIR/opencv --strip-components 1
9292
cd $BASEDIR/opencv
9393
patch -p1 < $SRCDIR/0001-export-exif-orientation.patch
94+
patch -p1 < $BASEDIR/patches/0001-remove-invalid-flow-control.patch
9495
mkdir -p $BUILDDIR/opencv
9596
cd $BUILDDIR/opencv
9697
cmake $BASEDIR/opencv -DWITH_JPEG=ON -DWITH_PNG=ON -DWITH_WEBP=ON -DWITH_JASPER=OFF -DWITH_TIFF=OFF -DWITH_OPENEXR=OFF -DWITH_OPENCL=OFF -DBUILD_JPEG=OFF -DBUILD_PNG=OFF -DBUILD_ZLIB=OFF -DENABLE_SSE41=ON -DENABLE_SSE42=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_DOCS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_opencv_photo=OFF -DBUILD_opencv_video=OFF -DBUILD_opencv_videoio=OFF -DBUILD_opencv_highgui=OFF -DBUILD_opencv_ml=off -DBUILD_opencv_flann=off -DCMAKE_LIBRARY_PATH=$PREFIX/LIB -DCMAKE_INCLUDE_PATH=$PREFIX/INCLUDE -DCMAKE_INSTALL_PREFIX=$PREFIX
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
2+
index 5bb0479..3d07b1c 100644
3+
--- a/cmake/OpenCVCompilerOptions.cmake
4+
+++ b/cmake/OpenCVCompilerOptions.cmake
5+
@@ -18,8 +18,6 @@ if(ENABLE_CCACHE AND NOT CMAKE_COMPILER_IS_CCACHE)
6+
message(STATUS "Unable to compile program with enabled ccache, reverting...")
7+
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${__OLD_RULE_LAUNCH_COMPILE}")
8+
endif()
9+
- else()
10+
- message(STATUS "Looking for ccache - not found")
11+
endif()
12+
endif()
13+
endif()

0 commit comments

Comments
 (0)