From abdd342d5064a1aa7c77cb57bd02e7ea1a4794f9 Mon Sep 17 00:00:00 2001 From: Artem Myagkov Date: Wed, 31 Aug 2011 18:42:44 +0000 Subject: [PATCH] modifed minimum required cmake version for ios --- CMakeLists.txt | 6 +++++- doc/tutorials/introduction/ios_install/ios_install.rst | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fe53c069..fe7c08d7c 100644 --- 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) diff --git a/doc/tutorials/introduction/ios_install/ios_install.rst b/doc/tutorials/introduction/ios_install/ios_install.rst index 4b4f55160..7516ce0db 100644 --- 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