File tree Expand file tree Collapse file tree 2 files changed +19
-1
lines changed Expand file tree Collapse file tree 2 files changed +19
-1
lines changed Original file line number Diff line number Diff line change @@ -10,9 +10,14 @@ echo 'PIP and brew installs'
10
10
11
11
pip install $BUILD_DEPENDS
12
12
13
+ cd opencv
14
+
15
+ echo " Apply patch"
16
+
17
+ git apply ../travis/disable_i386.patch
18
+
13
19
echo ' Config make'
14
20
15
- cd opencv
16
21
mkdir build
17
22
cd build
18
23
Original file line number Diff line number Diff line change
1
+ diff --git a/CMakeLists.txt b/CMakeLists.txt
2
+ index af5e2c1..4ef83c1 100644
3
+ --- a/CMakeLists.txt
4
+ +++ b/CMakeLists.txt
5
+ @@ -192,6 +192,8 @@ if(MINGW)
6
+ endif()
7
+ endif()
8
+
9
+ + string(REPLACE "-arch i386" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
10
+ +
11
+ # ----------------------------------------------------------------------------
12
+ # OpenCV cmake options
13
+ # ----------------------------------------------------------------------------
You can’t perform that action at this time.
0 commit comments