Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV_FUN
opencv
提交
7c0193bb
O
opencv
项目概览
OpenCV_FUN
/
opencv
与 Fork 源项目一致
Fork自
OpenCV / opencv
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
7c0193bb
编写于
11月 30, 2017
作者:
A
Alexander Alekhin
提交者:
GitHub
11月 30, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10198 from alalek:fix_build_xcode_9.1_2.4
(2.4) Fix build with Xcode 9.1
上级
91fe01be
97507e42
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
17 addition
and
7 deletion
+17
-7
3rdparty/libjasper/CMakeLists.txt
3rdparty/libjasper/CMakeLists.txt
+1
-1
3rdparty/libpng/CMakeLists.txt
3rdparty/libpng/CMakeLists.txt
+2
-2
cmake/OpenCVCompilerOptions.cmake
cmake/OpenCVCompilerOptions.cmake
+1
-1
platforms/ios/build_framework.py
platforms/ios/build_framework.py
+1
-0
platforms/ios/cmake/Modules/Platform/iOS.cmake
platforms/ios/cmake/Modules/Platform/iOS.cmake
+4
-1
platforms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake
...forms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake
+4
-1
platforms/ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake
...os/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake
+4
-1
未找到文件。
3rdparty/libjasper/CMakeLists.txt
浏览文件 @
7c0193bb
...
...
@@ -25,7 +25,7 @@ endif(WIN32 AND NOT MINGW)
ocv_warnings_disable
(
CMAKE_C_FLAGS -Wno-implicit-function-declaration -Wno-uninitialized -Wmissing-prototypes
-Wno-unused-but-set-parameter -Wmissing-declarations -Wunused -Wshadow -Wsign-compare
)
ocv_warnings_disable
(
CMAKE_C_FLAGS -Wunused-parameter
)
# clang
ocv_warnings_disable
(
CMAKE_C_FLAGS -Wunused-parameter
-Wstrict-prototypes
)
# clang
ocv_warnings_disable
(
CMAKE_C_FLAGS /wd4013 /wd4018 /wd4101 /wd4244 /wd4267 /wd4715
)
# vs2005
if
(
UNIX
)
...
...
3rdparty/libpng/CMakeLists.txt
浏览文件 @
7c0193bb
...
...
@@ -3,7 +3,7 @@
#
# ----------------------------------------------------------------------------
if
(
ARM AND ENABLE_NEON AND NOT AARCH64
)
if
(
ARM AND ENABLE_NEON AND NOT AARCH64
AND NOT IOS
)
project
(
${
PNG_LIBRARY
}
ASM
)
else
()
project
(
${
PNG_LIBRARY
}
)
...
...
@@ -14,7 +14,7 @@ ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}" ${ZLIB_INCLUDE_DIR})
file
(
GLOB lib_srcs *.c
)
file
(
GLOB lib_hdrs *.h
)
if
(
ARM AND ENABLE_NEON AND NOT AARCH64
)
if
(
ARM AND ENABLE_NEON AND NOT AARCH64
AND NOT IOS
)
list
(
APPEND lib_srcs arm/filter_neon.S arm/arm_init.c
)
add_definitions
(
-DPNG_ARM_NEON_OPT=2
)
else
()
...
...
cmake/OpenCVCompilerOptions.cmake
浏览文件 @
7c0193bb
...
...
@@ -164,7 +164,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
# Other optimizations
if
(
ENABLE_OMIT_FRAME_POINTER
)
add_extra_compiler_option
(
-fomit-frame-pointer
)
else
(
)
else
if
(
DEFINED ENABLE_OMIT_FRAME_POINTER
)
add_extra_compiler_option
(
-fno-omit-frame-pointer
)
endif
()
if
(
ENABLE_FAST_MATH
)
...
...
platforms/ios/build_framework.py
浏览文件 @
7c0193bb
...
...
@@ -49,6 +49,7 @@ def build_opencv(srcroot, buildroot, target, arch):
# for some reason, if you do not specify CMAKE_BUILD_TYPE, it puts libs to "RELEASE" rather than "Release"
cmakeargs
=
(
"-GXcode "
+
"-DCMAKE_BUILD_TYPE=Release "
+
(
"-DIOS_ARCH=%s "
%
arch
)
+
"-DCMAKE_TOOLCHAIN_FILE=%s/platforms/ios/cmake/Toolchains/Toolchain-%s_Xcode.cmake "
+
"-DBUILD_opencv_world=ON "
+
"-DCMAKE_C_FLAGS=
\"
-Wno-implicit-function-declaration
\"
"
+
...
...
platforms/ios/cmake/Modules/Platform/iOS.cmake
浏览文件 @
7c0193bb
...
...
@@ -43,7 +43,10 @@ set (no_warn "-Wno-unused-function -Wno-overloaded-virtual")
set
(
CMAKE_C_FLAGS
"
${
no_warn
}
"
)
set
(
CMAKE_CXX_FLAGS
"-stdlib=libc++ -fvisibility=hidden -fvisibility-inlines-hidden
${
no_warn
}
"
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"-DNDEBUG -O3 -fomit-frame-pointer -ffast-math"
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"-DNDEBUG -O3 -ffast-math"
)
if
(
NOT IOS_ARCH STREQUAL
"armv7"
AND NOT IOS_ARCH STREQUAL
"armv7s"
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
-fomit-frame-pointer"
)
endif
()
if
(
HAVE_FLAG_SEARCH_PATHS_FIRST
)
set
(
CMAKE_C_LINK_FLAGS
"-Wl,-search_paths_first
${
CMAKE_C_LINK_FLAGS
}
"
)
...
...
platforms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake
浏览文件 @
7c0193bb
...
...
@@ -2,7 +2,10 @@ message (STATUS "Setting up iPhoneOS toolchain")
set
(
IPHONEOS TRUE
)
# Standard settings
set
(
CMAKE_SYSTEM_NAME iOS
)
set
(
CMAKE_SYSTEM_NAME iOS
)
set
(
CMAKE_SYSTEM_VERSION 6.0
)
set
(
CMAKE_SYSTEM_PROCESSOR
"
${
IOS_ARCH
}
"
)
# Include extra modules for the iOS platform files
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/platforms/ios/cmake/Modules"
)
...
...
platforms/ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake
浏览文件 @
7c0193bb
...
...
@@ -2,7 +2,10 @@ message (STATUS "Setting up iPhoneSimulator toolchain")
set
(
IPHONESIMULATOR TRUE
)
# Standard settings
set
(
CMAKE_SYSTEM_NAME iOS
)
set
(
CMAKE_SYSTEM_NAME iOS
)
set
(
CMAKE_SYSTEM_VERSION 6.0
)
set
(
CMAKE_SYSTEM_PROCESSOR
"
${
IOS_ARCH
}
"
)
# Include extra modules for the iOS platform files
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/platforms/ios/cmake/Modules"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录