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
879e046b
Commit
879e046b
authored
Sep 19, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12586 from Slyce-Inc:bug-xcode10-compile
parents
5fb0f34e
b6d5565d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
build_framework.py
platforms/ios/build_framework.py
+1
-1
common-ios-toolchain.cmake
platforms/ios/cmake/Toolchains/common-ios-toolchain.cmake
+2
-3
No files found.
platforms/ios/build_framework.py
View file @
879e046b
...
...
@@ -161,7 +161,7 @@ class Builder:
else
:
arch
=
";"
.
join
(
archs
)
buildcmd
+=
[
"IPHONEOS_DEPLOYMENT_TARGET=
6
.0"
,
"IPHONEOS_DEPLOYMENT_TARGET=
8
.0"
,
"ARCHS=
%
s"
%
arch
,
]
...
...
platforms/ios/cmake/Toolchains/common-ios-toolchain.cmake
View file @
879e046b
...
...
@@ -110,7 +110,7 @@ ${CMAKE_MAKE_PROGRAM} IPHONEOS_DEPLOYMENT_TARGET=8.0 -sdk ${CMAKE_OSX_SYSROOT} \
else
()
set
(
_xcodebuild_wrapper_tmp
"
${
CMAKE_BINARY_DIR
}${
CMAKE_FILES_DIRECTORY
}
/xcodebuild_wrapper"
)
file
(
WRITE
"
${
_xcodebuild_wrapper_tmp
}
"
"#!/bin/sh
${
CMAKE_MAKE_PROGRAM
}
IPHONEOS_DEPLOYMENT_TARGET=
6
.0 ARCHS=
${
IOS_ARCH
}
-sdk
${
CMAKE_OSX_SYSROOT
}
\$
*"
)
${
CMAKE_MAKE_PROGRAM
}
IPHONEOS_DEPLOYMENT_TARGET=
8
.0 ARCHS=
${
IOS_ARCH
}
-sdk
${
CMAKE_OSX_SYSROOT
}
\$
*"
)
# Make executable
file
(
COPY
"
${
_xcodebuild_wrapper_tmp
}
"
DESTINATION
${
CMAKE_BINARY_DIR
}
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
set
(
CMAKE_MAKE_PROGRAM
"
${
_xcodebuild_wrapper
}
"
CACHE INTERNAL
""
FORCE
)
...
...
@@ -162,4 +162,4 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
set
(
CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY
)
set
(
CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY
)
toolchain_save_config
(
IOS_ARCH
)
\ No newline at end of file
toolchain_save_config
(
IOS_ARCH
)
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