Skip to content

Instantly share code, notes, and snippets.

@faultier

faultier/OpenCV-2.2-iOS.patch

Created January 15, 2011 07:56
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save faultier/780773 to your computer and use it in GitHub Desktop.
Save faultier/780773 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
OpenCV-2.2-iOS.patch
Binary files OpenCV-2.2.0/.DS_Store and OpenCV-2.2.0-patched/.DS_Store differ
diff -crN OpenCV-2.2.0/CMakeLists.txt OpenCV-2.2.0-patched/CMakeLists.txt
*** OpenCV-2.2.0/CMakeLists.txt 2011-01-17 01:34:31.000000000 +0900
--- OpenCV-2.2.0-patched/CMakeLists.txt 2011-01-17 01:28:02.000000000 +0900
***************
*** 15,24 ****
--- 15,56 ----
if(UNIX)
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
endif()
+
+ IF(APPLE)
+ OPTION(IOS_DEVICE "Build library for iOS" OFF)
+ OPTION(IOS_SIMULATOR "Build library for iPhone simulator" OFF)
+ IF(IOS_DEVICE OR IOS_SIMULATOR)
+ SET(IOS ON)
+ IF(IOS_SIMULATOR)
+ SET(IOS_PLATFORM "iPhoneSimulator")
+ SET(IOS_ARCHITECTURES "i386" CACHE INTERNAL "")
+ SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
+ SET(IOS_DEVICE OFF)
+ ELSE()
+ SET(IOS_PLATFORM "iPhoneOS")
+ SET(IOS_ARCHITECTURES "armv6;armv7" CACHE INTERNAL "")
+ ENDIF()
+ SET(IOS_SDK_VERSION "4.2" CACHE STRING "SDK version")
+ SET(IOS_DEPLOYMENT_TARGET "3.0" CACHE STRING "Deployment target")
+ SET(IOS_DEVELOPER_ROOT "/Developer/Platforms/${IOS_PLATFORM}.platform/Developer")
+ SET(IOS_SDK_ROOT "${IOS_DEVELOPER_ROOT}/SDKs/${IOS_PLATFORM}${IOS_SDK_VERSION}.sdk")
+ IF(NOT EXISTS ${IOS_SDK_ROOT})
+ MESSAGE(FATAL_ERROR "iOS SDK Version ${IOS_SDK_VERSION}(${IOS_SDK_ROOT}) is not found, please select iOS version you have.")
+ ENDIF()
+ SET(CMAKE_BUILD_TYPE "Release")
+ SET(CMAKE_OSX_SYSROOT "${IOS_SDK_ROOT}" CACHE STRING "" FORCE)
+ SET(CMAKE_OSX_ARCHITECTURES "${IOS_ARCHITECTURES}" CACHE STRING "" FORCE)
+ SET(CMAKE_C_COMPILER "${IOS_DEVELOPER_ROOT}/usr/bin/gcc")
+ SET(CMAKE_CXX_COMPILER "${IOS_DEVELOPER_ROOT}/usr/bin/g++")
+ ENDIF()
+ ENDIF()
+
# it _must_ go before PROJECT(OpenCV) in order to work
if (NOT CMAKE_INSTALL_PREFIX)
if (WIN32)
set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR} CACHE INTERNAL "" FORCE)
+ elseif(APPLE AND IOS)
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_OSX_SYSROOT}/opt/local" CACHE INTERNAL "" FORCE)
elseif()
set(CMAKE_INSTALL_PREFIX "/usr" CACHE INTERNAL "" FORCE)
endif()
***************
*** 94,100 ****
--- 126,136 ----
# Build static or dynamic libs?
# ----------------------------------------------------------------------------
# Default: dynamic libraries:
+ IF(IOS)
+ SET(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
+ ELSE()
SET(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
+ ENDIF()
IF(BUILD_SHARED_LIBS)
SET(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc.
ELSE(BUILD_SHARED_LIBS)
***************
*** 202,218 ****
# Build tests:
# ===================================================
set(BUILD_TESTS ON CACHE BOOL "Build tests")
# Build 3rdparty libraries under unix
# ===================================================
! if(WIN32 OR APPLE)
set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries")
else()
set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
endif()
include(OpenCVPCHSupport.cmake REQUIRED)
include(OpenCVModule.cmake REQUIRED)
if(UNIX)
--- 238,260 ----
# Build tests:
# ===================================================
+ IF(IOS)
+ set(BUILD_TESTS OFF CACHE BOOL "Build tests")
+ ELSE()
set(BUILD_TESTS ON CACHE BOOL "Build tests")
+ ENDIF()
# Build 3rdparty libraries under unix
# ===================================================
! if(WIN32 OR (APPLE AND NOT IOS))
set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries")
else()
set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
endif()
+ IF(NOT IOS)
include(OpenCVPCHSupport.cmake REQUIRED)
+ ENDIF()
include(OpenCVModule.cmake REQUIRED)
if(UNIX)
***************
*** 263,270 ****
# enable everything, since the available set of instructions is checked at runtime
set(USE_O3 ON CACHE BOOL "Enable -O3")
set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math")
! set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
! set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
--- 305,317 ----
# enable everything, since the available set of instructions is checked at runtime
set(USE_O3 ON CACHE BOOL "Enable -O3")
set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math")
! IF(IOS_DEVICE)
! set(ENABLE_SSE OFF CACHE BOOL "Enable SSE instructions")
! set(ENABLE_SSE2 OFF CACHE BOOL "Enable SSE2 instructions")
! ELSE()
! set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
! set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
! ENDIF()
set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
***************
*** 277,288 ****
# ====================================================================
set(WITH_PNG ON CACHE BOOL "Include PNG support")
set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
- set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
- set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
if(UNIX)
- set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
if(NOT APPLE)
set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
set(WITH_GTK ON CACHE BOOL "Include GTK support")
--- 324,339 ----
# ====================================================================
set(WITH_PNG ON CACHE BOOL "Include PNG support")
set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
+ IF(IOS)
+ set(WITH_JASPER OFF CACHE BOOL "Include JPEG2K support")
+ set(WITH_TIFF OFF CACHE BOOL "Include TIFF support")
+ ELSE()
+ set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
+ set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
+ ENDIF()
if(UNIX)
if(NOT APPLE)
set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
set(WITH_GTK ON CACHE BOOL "Include GTK support")
***************
*** 290,297 ****
set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
endif()
! set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
! set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
endif()
if(APPLE)
--- 341,355 ----
set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
endif()
! IF(IOS)
! set(WITH_FFMPEG OFF CACHE BOOL "Include FFMPEG support")
! set(WITH_1394 OFF CACHE BOOL "Include IEEE1394 support")
! set(WITH_PVAPI OFF CACHE BOOL "Include Prosilica GigE support")
! ELSE()
! set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
! set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
! set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
! ENDIF()
endif()
if(APPLE)
***************
*** 299,306 ****
set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
endif()
! set(WITH_TBB OFF CACHE BOOL "Include TBB support")
! set(WITH_EIGEN2 ON CACHE BOOL "Include Eigen2/Eigen3 support")
set(WITH_CUDA OFF CACHE BOOL "Include NVidia Cuda Runtime support")
if(WIN32)
--- 357,369 ----
set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
endif()
! IF(IOS)
! set(WITH_TBB OFF CACHE BOOL "Include TBB support")
! set(WITH_EIGEN2 OFF CACHE BOOL "Include Eigen2/Eigen3 support")
! ELSE()
! set(WITH_TBB OFF CACHE BOOL "Include TBB support")
! set(WITH_EIGEN2 ON CACHE BOOL "Include Eigen2/Eigen3 support")
! ENDIF()
set(WITH_CUDA OFF CACHE BOOL "Include NVidia Cuda Runtime support")
if(WIN32)
***************
*** 324,330 ****
PKG_CHECK_MODULES(${ALIAS} ${module_name})
! if (${ALIAS_FOUND})
set(${define} 1)
foreach(P "${ALIAS_INCLUDE_DIRS}")
if (${P})
--- 387,393 ----
PKG_CHECK_MODULES(${ALIAS} ${module_name})
! if (${ALIAS_FOUND} AND NOT IOS)
set(${define} 1)
foreach(P "${ALIAS_INCLUDE_DIRS}")
if (${P})
***************
*** 496,502 ****
include(OpenCVFindOpenEXR.cmake)
endif()
! set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
if(BUILD_NEW_PYTHON_SUPPORT)
find_package(PythonInterp)
--- 559,569 ----
include(OpenCVFindOpenEXR.cmake)
endif()
! IF(IOS)
! set(BUILD_NEW_PYTHON_SUPPORT OFF CACHE BOOL "Build with Python support")
! ELSE()
! set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
! ENDIF()
if(BUILD_NEW_PYTHON_SUPPORT)
find_package(PythonInterp)
***************
*** 827,837 ****
--- 894,906 ----
################### DOXYGEN ###############
+ IF(NOT IOS)
find_package(Doxygen)
if(DOXYGEN_FOUND)
set(BUILD_DOXYGEN_DOCS ON CACHE BOOL "Generate HTML docs using Doxygen")
endif()
+ ENDIF()
# ----------------------------------------------------------------------------
# UPDATE CONFIG FILES & SCRIPTS:
***************
*** 893,898 ****
--- 962,971 ----
set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} /Zi")
endif()
+ IF(APPLE AND IOS)
+ SET(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -miphoneos-version-min=${IOS_DEPLOYMENT_TARGET}")
+ ENDIF()
+
if(CMAKE_COMPILER_IS_GNUCXX)
# High level of warnings.
***************
*** 1235,1241 ****
endif()
install(DIRECTORY data samples DESTINATION "." COMPONENT main PATTERN ".svn" EXCLUDE)
! install(DIRECTORY 3rdparty android modules tests DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
install(DIRECTORY doc/ DESTINATION doc COMPONENT src FILES_MATCHING PATTERN "*.tex")
install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
install(DIRECTORY doc/latex2sphinx DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
--- 1308,1316 ----
endif()
install(DIRECTORY data samples DESTINATION "." COMPONENT main PATTERN ".svn" EXCLUDE)
! IF(NOT IOS)
! install(DIRECTORY 3rdparty android modules tests DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
! ENDIF()
install(DIRECTORY doc/ DESTINATION doc COMPONENT src FILES_MATCHING PATTERN "*.tex")
install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
install(DIRECTORY doc/latex2sphinx DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
***************
*** 1376,1381 ****
--- 1451,1462 ----
else()
message(STATUS " Video I/O: QTKit")
endif()
+ message(STATUS " SYSROOT: ${CMAKE_OSX_SYSROOT}")
+ IF(IOS)
+ message(STATUS " Platform: ${IOS_PLATFORM}")
+ message(STATUS " SDK version: ${IOS_SDK_VERSION}")
+ message(STATUS " Deployment target: ${IOS_DEPLOYMENT_TARGET}")
+ ENDIF()
endif()
if(WIN32)
Binary files OpenCV-2.2.0/data/.DS_Store and OpenCV-2.2.0-patched/data/.DS_Store differ
Binary files OpenCV-2.2.0/doc/.DS_Store and OpenCV-2.2.0-patched/doc/.DS_Store differ
Binary files OpenCV-2.2.0/doc/latex2sphinx/.DS_Store and OpenCV-2.2.0-patched/doc/latex2sphinx/.DS_Store differ
Binary files OpenCV-2.2.0/modules/.DS_Store and OpenCV-2.2.0-patched/modules/.DS_Store differ
diff -crN OpenCV-2.2.0/modules/CMakeLists.txt OpenCV-2.2.0-patched/modules/CMakeLists.txt
*** OpenCV-2.2.0/modules/CMakeLists.txt 2011-01-17 01:34:33.000000000 +0900
--- OpenCV-2.2.0-patched/modules/CMakeLists.txt 2011-01-17 01:28:05.000000000 +0900
***************
*** 2,8 ****
--- 2,11 ----
configure_file("${CMAKE_SOURCE_DIR}/Android.mk.modules.in" "${CMAKE_CURRENT_BINARY_DIR}/Android.mk")
endif()
+ IF(NOT IOS)
add_subdirectory(calib3d)
+ add_subdirectory(highgui)
+ ENDIF()
add_subdirectory(core)
add_subdirectory(features2d)
add_subdirectory(flann)
***************
*** 13,19 ****
endif()
endif()
- add_subdirectory(highgui)
add_subdirectory(imgproc)
add_subdirectory(legacy)
add_subdirectory(contrib)
--- 16,21 ----
***************
*** 27,35 ****
add_subdirectory(video)
if(NOT ANDROID)
! add_subdirectory(haartraining)
! add_subdirectory(traincascade)
! add_subdirectory(gpu)
endif()
--- 29,39 ----
add_subdirectory(video)
if(NOT ANDROID)
! if(NOT IOS)
! add_subdirectory(haartraining)
! add_subdirectory(traincascade)
! endif()
! add_subdirectory(gpu)
endif()
Binary files OpenCV-2.2.0/modules/core/.DS_Store and OpenCV-2.2.0-patched/modules/core/.DS_Store differ
Binary files OpenCV-2.2.0/modules/core/include/.DS_Store and OpenCV-2.2.0-patched/modules/core/include/.DS_Store differ
Binary files OpenCV-2.2.0/modules/core/include/opencv2/.DS_Store and OpenCV-2.2.0-patched/modules/core/include/opencv2/.DS_Store differ
Binary files OpenCV-2.2.0/modules/imgproc/.DS_Store and OpenCV-2.2.0-patched/modules/imgproc/.DS_Store differ
Binary files OpenCV-2.2.0/modules/python/.DS_Store and OpenCV-2.2.0-patched/modules/python/.DS_Store differ
Binary files OpenCV-2.2.0/samples/.DS_Store and OpenCV-2.2.0-patched/samples/.DS_Store differ
Binary files OpenCV-2.2.0/samples/c/.DS_Store and OpenCV-2.2.0-patched/samples/c/.DS_Store differ
Binary files OpenCV-2.2.0/tests/.DS_Store and OpenCV-2.2.0-patched/tests/.DS_Store differ
Binary files OpenCV-2.2.0/tests/cv/.DS_Store and OpenCV-2.2.0-patched/tests/cv/.DS_Store differ
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment