Merge pull request #147 from mshabunin/ios-extra-world

Disable some modules for iOS framework world build

Merge pull request #147 from mshabunin/ios-extra-world
Disable some modules for iOS framework world build
5e427d22 · Vadim Pisarevsky · c13ee037 · f52ba671 · 5e427d22 · 5e427d22
Commit 5e427d22 authored Jan 20, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

CMakeLists.txt modules/adas/CMakeLists.txt +4 -0

CMakeLists.txt modules/saliency/CMakeLists.txt +1 -0

CMakeLists.txt modules/ximgproc/CMakeLists.txt +1 -0

No files found.
--- a/modules/adas/CMakeLists.txt
+++ b/modules/adas/CMakeLists.txt
+if(IOS)
+    ocv_module_disable(adas)
+endif()
+
 set(the_description "Automatic driver assistance algorithms")
 ocv_define_module(adas opencv_xobjdetect)


--- a/modules/saliency/CMakeLists.txt
+++ b/modules/saliency/CMakeLists.txt
 set(the_description "Saliency API")
+set(OPENCV_MODULE_IS_PART_OF_WORLD OFF)
 ocv_define_module(saliency opencv_imgproc opencv_highgui opencv_features2d)
--- a/modules/ximgproc/CMakeLists.txt
+++ b/modules/ximgproc/CMakeLists.txt
 set(the_description "Extended image processing module. It includes edge-aware filters and etc.")
+set(OPENCV_MODULE_IS_PART_OF_WORLD OFF)
 ocv_define_module(ximgproc opencv_imgproc opencv_core opencv_highgui)

 target_link_libraries(opencv_ximgproc)