modifed minimum required cmake version for ios

abdd342d · Artem Myagkov · ec6636a6 · abdd342d · abdd342d
Commit abdd342d authored Aug 31, 2011 by Artem Myagkov
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

CMakeLists.txt CMakeLists.txt +5 -1

ios_install.rst doc/tutorials/introduction/ios_install/ios_install.rst +1 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,11 @@ endif(NOT CMAKE_TOOLCHAIN_FILE)
 # --------------------------------------------------------------
 # Top level OpenCV project
 # --------------------------------------------------------------
-cmake_minimum_required(VERSION 2.6)
+if(NOT IOS)
+	cmake_minimum_required(VERSION 2.6)
+else()
+	cmake_minimum_required(VERSION 2.8)
+endif()
 project(OpenCV)

 set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)

--- a/doc/tutorials/introduction/ios_install/ios_install.rst
+++ b/doc/tutorials/introduction/ios_install/ios_install.rst
@@ -7,7 +7,7 @@ Required packages
 ==================

  * GCC 4.x or later
-  * CMake 2.6 or higher
+  * CMake 2.8 or higher
  * Xcode 4.0 or higher

 Getting the cutting-edge OpenCV from SourceForge SVN repository