Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modifed minimum required cmake version for ios

Browse Source
pull/13383/head
Artem Myagkov 14 years ago
parent ec6636a664
commit abdd342d50
2 changed files with 6 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      CMakeLists.txt
  2. 2
      doc/tutorials/introduction/ios_install/ios_install.rst

6
CMakeLists.txt
Unescape View File

@ -36,7 +36,11 @@ endif(NOT CMAKE_TOOLCHAIN_FILE)
# -------------------------------------------------------------- # --------------------------------------------------------------
# Top level OpenCV project # 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) project(OpenCV)
set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE) set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)

2
doc/tutorials/introduction/ios_install/ios_install.rst
Unescape View File

@ -7,7 +7,7 @@ Required packages
================== ==================
* GCC 4.x or later * GCC 4.x or later
* CMake 2.6 or higher * CMake 2.8 or higher
* Xcode 4.0 or higher * Xcode 4.0 or higher
Getting the cutting-edge OpenCV from SourceForge SVN repository Getting the cutting-edge OpenCV from SourceForge SVN repository

Write Preview
Loading…
Cancel
Save