API tools faq
paste
Guest User

Untitled

a guest
Jul 20th, 2018
81
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 14.29 KB | None | 0 0
raw download clone embed print report
  1. Binary files OpenCV-2.2.0/.DS_Store and OpenCV-2.2.0-patched/.DS_Store differ
  2. diff -crN OpenCV-2.2.0/CMakeLists.txt OpenCV-2.2.0-patched/CMakeLists.txt
  3. *** OpenCV-2.2.0/CMakeLists.txt 2011-01-17 01:34:31.000000000 +0900
  4. --- OpenCV-2.2.0-patched/CMakeLists.txt 2011-01-17 01:28:02.000000000 +0900
  5. ***************
  6. *** 15,24 ****
  7. --- 15,56 ----
  8. if(UNIX)
  9. set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
  10. endif()
  11. +
  12. + IF(APPLE)
  13. + OPTION(IOS_DEVICE "Build library for iOS" OFF)
  14. + OPTION(IOS_SIMULATOR "Build library for iPhone simulator" OFF)
  15. + IF(IOS_DEVICE OR IOS_SIMULATOR)
  16. + SET(IOS ON)
  17. + IF(IOS_SIMULATOR)
  18. + SET(IOS_PLATFORM "iPhoneSimulator")
  19. + SET(IOS_ARCHITECTURES "i386" CACHE INTERNAL "")
  20. + SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
  21. + SET(IOS_DEVICE OFF)
  22. + ELSE()
  23. + SET(IOS_PLATFORM "iPhoneOS")
  24. + SET(IOS_ARCHITECTURES "armv6;armv7" CACHE INTERNAL "")
  25. + ENDIF()
  26. + SET(IOS_SDK_VERSION "4.2" CACHE STRING "SDK version")
  27. + SET(IOS_DEPLOYMENT_TARGET "3.0" CACHE STRING "Deployment target")
  28. + SET(IOS_DEVELOPER_ROOT "/Developer/Platforms/${IOS_PLATFORM}.platform/Developer")
  29. + SET(IOS_SDK_ROOT "${IOS_DEVELOPER_ROOT}/SDKs/${IOS_PLATFORM}${IOS_SDK_VERSION}.sdk")
  30. + IF(NOT EXISTS ${IOS_SDK_ROOT})
  31. + MESSAGE(FATAL_ERROR "iOS SDK Version ${IOS_SDK_VERSION}(${IOS_SDK_ROOT}) is not found, please select iOS version you have.")
  32. + ENDIF()
  33. + SET(CMAKE_BUILD_TYPE "Release")
  34. + SET(CMAKE_OSX_SYSROOT "${IOS_SDK_ROOT}" CACHE STRING "" FORCE)
  35. + SET(CMAKE_OSX_ARCHITECTURES "${IOS_ARCHITECTURES}" CACHE STRING "" FORCE)
  36. + SET(CMAKE_C_COMPILER "${IOS_DEVELOPER_ROOT}/usr/bin/gcc")
  37. + SET(CMAKE_CXX_COMPILER "${IOS_DEVELOPER_ROOT}/usr/bin/g++")
  38. + ENDIF()
  39. + ENDIF()
  40. +
  41. # it _must_ go before PROJECT(OpenCV) in order to work
  42. if (NOT CMAKE_INSTALL_PREFIX)
  43. if (WIN32)
  44. set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR} CACHE INTERNAL "" FORCE)
  45. + elseif(APPLE AND IOS)
  46. + set(CMAKE_INSTALL_PREFIX "${CMAKE_OSX_SYSROOT}/opt/local" CACHE INTERNAL "" FORCE)
  47. elseif()
  48. set(CMAKE_INSTALL_PREFIX "/usr" CACHE INTERNAL "" FORCE)
  49. endif()
  50. ***************
  51. *** 94,100 ****
  52. --- 126,136 ----
  53. # Build static or dynamic libs?
  54. # ----------------------------------------------------------------------------
  55. # Default: dynamic libraries:
  56. + IF(IOS)
  57. + SET(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
  58. + ELSE()
  59. SET(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
  60. + ENDIF()
  61. IF(BUILD_SHARED_LIBS)
  62. SET(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc.
  63. ELSE(BUILD_SHARED_LIBS)
  64. ***************
  65. *** 202,218 ****
  66.  
  67. # Build tests:
  68. # ===================================================
  69. set(BUILD_TESTS ON CACHE BOOL "Build tests")
  70.  
  71. # Build 3rdparty libraries under unix
  72. # ===================================================
  73. ! if(WIN32 OR APPLE)
  74. set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries")
  75. else()
  76. set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
  77. endif()
  78.  
  79. include(OpenCVPCHSupport.cmake REQUIRED)
  80. include(OpenCVModule.cmake REQUIRED)
  81.  
  82. if(UNIX)
  83. --- 238,260 ----
  84.  
  85. # Build tests:
  86. # ===================================================
  87. + IF(IOS)
  88. + set(BUILD_TESTS OFF CACHE BOOL "Build tests")
  89. + ELSE()
  90. set(BUILD_TESTS ON CACHE BOOL "Build tests")
  91. + ENDIF()
  92.  
  93. # Build 3rdparty libraries under unix
  94. # ===================================================
  95. ! if(WIN32 OR (APPLE AND NOT IOS))
  96. set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries")
  97. else()
  98. set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
  99. endif()
  100.  
  101. + IF(NOT IOS)
  102. include(OpenCVPCHSupport.cmake REQUIRED)
  103. + ENDIF()
  104. include(OpenCVModule.cmake REQUIRED)
  105.  
  106. if(UNIX)
  107. ***************
  108. *** 263,270 ****
  109. # enable everything, since the available set of instructions is checked at runtime
  110. set(USE_O3 ON CACHE BOOL "Enable -O3")
  111. set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math")
  112. ! set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
  113. ! set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
  114. set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
  115. set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
  116. set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
  117. --- 305,317 ----
  118. # enable everything, since the available set of instructions is checked at runtime
  119. set(USE_O3 ON CACHE BOOL "Enable -O3")
  120. set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math")
  121. ! IF(IOS_DEVICE)
  122. ! set(ENABLE_SSE OFF CACHE BOOL "Enable SSE instructions")
  123. ! set(ENABLE_SSE2 OFF CACHE BOOL "Enable SSE2 instructions")
  124. ! ELSE()
  125. ! set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
  126. ! set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
  127. ! ENDIF()
  128. set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
  129. set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
  130. set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
  131. ***************
  132. *** 277,288 ****
  133. # ====================================================================
  134. set(WITH_PNG ON CACHE BOOL "Include PNG support")
  135. set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
  136. - set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
  137. - set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
  138. set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
  139.  
  140. if(UNIX)
  141. - set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
  142. if(NOT APPLE)
  143. set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
  144. set(WITH_GTK ON CACHE BOOL "Include GTK support")
  145. --- 324,339 ----
  146. # ====================================================================
  147. set(WITH_PNG ON CACHE BOOL "Include PNG support")
  148. set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
  149. set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
  150. + IF(IOS)
  151. + set(WITH_JASPER OFF CACHE BOOL "Include JPEG2K support")
  152. + set(WITH_TIFF OFF CACHE BOOL "Include TIFF support")
  153. + ELSE()
  154. + set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
  155. + set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
  156. + ENDIF()
  157.  
  158. if(UNIX)
  159. if(NOT APPLE)
  160. set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
  161. set(WITH_GTK ON CACHE BOOL "Include GTK support")
  162. ***************
  163. *** 290,297 ****
  164. set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
  165. set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
  166. endif()
  167. ! set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
  168. ! set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
  169. endif()
  170.  
  171. if(APPLE)
  172. --- 341,355 ----
  173. set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
  174. set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
  175. endif()
  176. ! IF(IOS)
  177. ! set(WITH_FFMPEG OFF CACHE BOOL "Include FFMPEG support")
  178. ! set(WITH_1394 OFF CACHE BOOL "Include IEEE1394 support")
  179. ! set(WITH_PVAPI OFF CACHE BOOL "Include Prosilica GigE support")
  180. ! ELSE()
  181. ! set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
  182. ! set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
  183. ! set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
  184. ! ENDIF()
  185. endif()
  186.  
  187. if(APPLE)
  188. ***************
  189. *** 299,306 ****
  190. set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
  191. endif()
  192.  
  193. ! set(WITH_TBB OFF CACHE BOOL "Include TBB support")
  194. ! set(WITH_EIGEN2 ON CACHE BOOL "Include Eigen2/Eigen3 support")
  195. set(WITH_CUDA OFF CACHE BOOL "Include NVidia Cuda Runtime support")
  196.  
  197. if(WIN32)
  198. --- 357,369 ----
  199. set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
  200. endif()
  201.  
  202. ! IF(IOS)
  203. ! set(WITH_TBB OFF CACHE BOOL "Include TBB support")
  204. ! set(WITH_EIGEN2 OFF CACHE BOOL "Include Eigen2/Eigen3 support")
  205. ! ELSE()
  206. ! set(WITH_TBB OFF CACHE BOOL "Include TBB support")
  207. ! set(WITH_EIGEN2 ON CACHE BOOL "Include Eigen2/Eigen3 support")
  208. ! ENDIF()
  209. set(WITH_CUDA OFF CACHE BOOL "Include NVidia Cuda Runtime support")
  210.  
  211. if(WIN32)
  212. ***************
  213. *** 324,330 ****
  214.  
  215. PKG_CHECK_MODULES(${ALIAS} ${module_name})
  216.  
  217. ! if (${ALIAS_FOUND})
  218. set(${define} 1)
  219. foreach(P "${ALIAS_INCLUDE_DIRS}")
  220. if (${P})
  221. --- 387,393 ----
  222.  
  223. PKG_CHECK_MODULES(${ALIAS} ${module_name})
  224.  
  225. ! if (${ALIAS_FOUND} AND NOT IOS)
  226. set(${define} 1)
  227. foreach(P "${ALIAS_INCLUDE_DIRS}")
  228. if (${P})
  229. ***************
  230. *** 496,502 ****
  231. include(OpenCVFindOpenEXR.cmake)
  232. endif()
  233.  
  234. ! set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
  235.  
  236. if(BUILD_NEW_PYTHON_SUPPORT)
  237. find_package(PythonInterp)
  238. --- 559,569 ----
  239. include(OpenCVFindOpenEXR.cmake)
  240. endif()
  241.  
  242. ! IF(IOS)
  243. ! set(BUILD_NEW_PYTHON_SUPPORT OFF CACHE BOOL "Build with Python support")
  244. ! ELSE()
  245. ! set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
  246. ! ENDIF()
  247.  
  248. if(BUILD_NEW_PYTHON_SUPPORT)
  249. find_package(PythonInterp)
  250. ***************
  251. *** 827,837 ****
  252. --- 894,906 ----
  253.  
  254. ################### DOXYGEN ###############
  255.  
  256. + IF(NOT IOS)
  257. find_package(Doxygen)
  258.  
  259. if(DOXYGEN_FOUND)
  260. set(BUILD_DOXYGEN_DOCS ON CACHE BOOL "Generate HTML docs using Doxygen")
  261. endif()
  262. + ENDIF()
  263.  
  264. # ----------------------------------------------------------------------------
  265. # UPDATE CONFIG FILES & SCRIPTS:
  266. ***************
  267. *** 893,898 ****
  268. --- 962,971 ----
  269. set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} /Zi")
  270. endif()
  271.  
  272. + IF(APPLE AND IOS)
  273. + SET(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -miphoneos-version-min=${IOS_DEPLOYMENT_TARGET}")
  274. + ENDIF()
  275. +
  276. if(CMAKE_COMPILER_IS_GNUCXX)
  277.  
  278. # High level of warnings.
  279. ***************
  280. *** 1235,1241 ****
  281. endif()
  282.  
  283. install(DIRECTORY data samples DESTINATION "." COMPONENT main PATTERN ".svn" EXCLUDE)
  284. ! install(DIRECTORY 3rdparty android modules tests DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
  285. install(DIRECTORY doc/ DESTINATION doc COMPONENT src FILES_MATCHING PATTERN "*.tex")
  286. install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
  287. install(DIRECTORY doc/latex2sphinx DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
  288. --- 1308,1316 ----
  289. endif()
  290.  
  291. install(DIRECTORY data samples DESTINATION "." COMPONENT main PATTERN ".svn" EXCLUDE)
  292. ! IF(NOT IOS)
  293. ! install(DIRECTORY 3rdparty android modules tests DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
  294. ! ENDIF()
  295. install(DIRECTORY doc/ DESTINATION doc COMPONENT src FILES_MATCHING PATTERN "*.tex")
  296. install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
  297. install(DIRECTORY doc/latex2sphinx DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
  298. ***************
  299. *** 1376,1381 ****
  300. --- 1451,1462 ----
  301. else()
  302. message(STATUS " Video I/O: QTKit")
  303. endif()
  304. + message(STATUS " SYSROOT: ${CMAKE_OSX_SYSROOT}")
  305. + IF(IOS)
  306. + message(STATUS " Platform: ${IOS_PLATFORM}")
  307. + message(STATUS " SDK version: ${IOS_SDK_VERSION}")
  308. + message(STATUS " Deployment target: ${IOS_DEPLOYMENT_TARGET}")
  309. + ENDIF()
  310. endif()
  311.  
  312. if(WIN32)
  313. Binary files OpenCV-2.2.0/data/.DS_Store and OpenCV-2.2.0-patched/data/.DS_Store differ
  314. Binary files OpenCV-2.2.0/doc/.DS_Store and OpenCV-2.2.0-patched/doc/.DS_Store differ
  315. Binary files OpenCV-2.2.0/doc/latex2sphinx/.DS_Store and OpenCV-2.2.0-patched/doc/latex2sphinx/.DS_Store differ
  316. Binary files OpenCV-2.2.0/modules/.DS_Store and OpenCV-2.2.0-patched/modules/.DS_Store differ
  317. diff -crN OpenCV-2.2.0/modules/CMakeLists.txt OpenCV-2.2.0-patched/modules/CMakeLists.txt
  318. *** OpenCV-2.2.0/modules/CMakeLists.txt 2011-01-17 01:34:33.000000000 +0900
  319. --- OpenCV-2.2.0-patched/modules/CMakeLists.txt 2011-01-17 01:28:05.000000000 +0900
  320. ***************
  321. *** 2,8 ****
  322. --- 2,11 ----
  323. configure_file("${CMAKE_SOURCE_DIR}/Android.mk.modules.in" "${CMAKE_CURRENT_BINARY_DIR}/Android.mk")
  324. endif()
  325.  
  326. + IF(NOT IOS)
  327. add_subdirectory(calib3d)
  328. + add_subdirectory(highgui)
  329. + ENDIF()
  330. add_subdirectory(core)
  331. add_subdirectory(features2d)
  332. add_subdirectory(flann)
  333. ***************
  334. *** 13,19 ****
  335. endif()
  336. endif()
  337.  
  338. - add_subdirectory(highgui)
  339. add_subdirectory(imgproc)
  340. add_subdirectory(legacy)
  341. add_subdirectory(contrib)
  342. --- 16,21 ----
  343. ***************
  344. *** 27,35 ****
  345. add_subdirectory(video)
  346.  
  347. if(NOT ANDROID)
  348. ! add_subdirectory(haartraining)
  349. ! add_subdirectory(traincascade)
  350. ! add_subdirectory(gpu)
  351. endif()
  352.  
  353.  
  354. --- 29,39 ----
  355. add_subdirectory(video)
  356.  
  357. if(NOT ANDROID)
  358. ! if(NOT IOS)
  359. ! add_subdirectory(haartraining)
  360. ! add_subdirectory(traincascade)
  361. ! endif()
  362. ! add_subdirectory(gpu)
  363. endif()
  364.  
  365.  
  366. Binary files OpenCV-2.2.0/modules/core/.DS_Store and OpenCV-2.2.0-patched/modules/core/.DS_Store differ
  367. Binary files OpenCV-2.2.0/modules/core/include/.DS_Store and OpenCV-2.2.0-patched/modules/core/include/.DS_Store differ
  368. 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
  369. Binary files OpenCV-2.2.0/modules/imgproc/.DS_Store and OpenCV-2.2.0-patched/modules/imgproc/.DS_Store differ
  370. Binary files OpenCV-2.2.0/modules/python/.DS_Store and OpenCV-2.2.0-patched/modules/python/.DS_Store differ
  371. Binary files OpenCV-2.2.0/samples/.DS_Store and OpenCV-2.2.0-patched/samples/.DS_Store differ
  372. Binary files OpenCV-2.2.0/samples/c/.DS_Store and OpenCV-2.2.0-patched/samples/c/.DS_Store differ
  373. Binary files OpenCV-2.2.0/tests/.DS_Store and OpenCV-2.2.0-patched/tests/.DS_Store differ
  374. Binary files OpenCV-2.2.0/tests/cv/.DS_Store and OpenCV-2.2.0-patched/tests/cv/.DS_Store differ
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!