Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
59cf62ad
Commit
59cf62ad
authored
May 05, 2014
by
Alexander Alekhin
Committed by
OpenCV Buildbot
May 05, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2636 from atrebbi:#3653
parents
f0d4ccc6
3d25d706
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
CMakeLists.txt
modules/world/CMakeLists.txt
+1
-0
build_framework.py
platforms/ios/build_framework.py
+1
-0
No files found.
modules/world/CMakeLists.txt
View file @
59cf62ad
...
...
@@ -103,6 +103,7 @@ macro(ios_include_3party_libs)
list
(
APPEND objlist
"
\"
${
objpath3
}
\"
"
)
endforeach
()
# (srcname ${sources})
endforeach
()
ocv_list_filterout
(
objlist jmemansi
)
# <<= dirty fix
endmacro
()
if
(
IOS AND WITH_PNG
)
...
...
platforms/ios/build_framework.py
View file @
59cf62ad
...
...
@@ -40,6 +40,7 @@ def build_opencv(srcroot, buildroot, target, arch):
"-DCMAKE_BUILD_TYPE=Release "
+
"-DCMAKE_TOOLCHAIN_FILE=
%
s/platforms/ios/cmake/Toolchains/Toolchain-
%
s_Xcode.cmake "
+
"-DBUILD_opencv_world=ON "
+
"-DCMAKE_C_FLAGS=
\"
-Wno-implicit-function-declaration
\"
"
+
"-DCMAKE_INSTALL_PREFIX=install"
)
%
(
srcroot
,
target
)
# if cmake cache exists, just rerun cmake to update OpenCV.xproj if necessary
if
os
.
path
.
isfile
(
os
.
path
.
join
(
builddir
,
"CMakeCache.txt"
)):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment