generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

another fix to make OpenCV more friendly for iOS developers. We now use libc++ instead of libstdc++ and clang instead of gcc to build opencv2.framework.

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-11-01 18:15:48 +04:00
parent d9d4e8df6f
commit 3d0c08816d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ios/build_framework.py
View File

@ -13,16 +13,16 @@ Script will create <outputdir>, if it's missing, and a few its subdirectories:
<outputdir> <outputdir>
build/ build/
iPhoneOS/ iPhoneOS-*/
[cmake-generated build tree for an iOS device target] [cmake-generated build tree for an iOS device target]
iPhoneSimulator/ iPhoneSimulator/
[cmake-generated build tree for iOS simulator] [cmake-generated build tree for iOS simulator]
OpenCV.framework/ opencv2.framework/
[the framework content] [the framework content]
The script should handle minor OpenCV updates efficiently The script should handle minor OpenCV updates efficiently
- it does not recompile the library from scratch each time. - it does not recompile the library from scratch each time.
However, OpenCV.framework directory is erased and recreated on each run. However, opencv2.framework directory is erased and recreated on each run.
""" """
import glob, re, os, os.path, shutil, string, sys import glob, re, os, os.path, shutil, string, sys

2
ios/cmake/Modules/Platform/iOS.cmake
View File

@ -40,7 +40,7 @@ set (CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
# Hidden visibilty is required for cxx on iOS # Hidden visibilty is required for cxx on iOS
set (CMAKE_C_FLAGS "") set (CMAKE_C_FLAGS "")
set (CMAKE_CXX_FLAGS "-headerpad_max_install_names -fvisibility=hidden -fvisibility-inlines-hidden") set (CMAKE_CXX_FLAGS "-stdlib=libc++ -headerpad_max_install_names -fvisibility=hidden -fvisibility-inlines-hidden")
set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -fomit-frame-pointer -ffast-math") set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -fomit-frame-pointer -ffast-math")

4
ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake
View File

@ -8,8 +8,8 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/ios/cma
# Force the compilers to gcc for iOS # Force the compilers to gcc for iOS
include (CMakeForceCompiler) include (CMakeForceCompiler)
CMAKE_FORCE_C_COMPILER (gcc gcc) #CMAKE_FORCE_C_COMPILER (gcc gcc)
CMAKE_FORCE_CXX_COMPILER (g++ g++) #CMAKE_FORCE_CXX_COMPILER (g++ g++)
set (CMAKE_C_SIZEOF_DATA_PTR 4) set (CMAKE_C_SIZEOF_DATA_PTR 4)
set (CMAKE_C_HAS_ISYSROOT 1) set (CMAKE_C_HAS_ISYSROOT 1)

4
ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake
View File

@ -8,8 +8,8 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/ios/cma
# Force the compilers to gcc for iOS # Force the compilers to gcc for iOS
include (CMakeForceCompiler) include (CMakeForceCompiler)
CMAKE_FORCE_C_COMPILER (gcc gcc) #CMAKE_FORCE_C_COMPILER (gcc gcc)
CMAKE_FORCE_CXX_COMPILER (g++ g++) #CMAKE_FORCE_CXX_COMPILER (g++ g++)
set (CMAKE_C_SIZEOF_DATA_PTR 4) set (CMAKE_C_SIZEOF_DATA_PTR 4)
set (CMAKE_C_HAS_ISYSROOT 1) set (CMAKE_C_HAS_ISYSROOT 1)