generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bumped minimal CMake version to 2.8.7.

Browse Source
This commit is contained in:
Roman Donchenko 2013-07-22 13:29:07 +04:00
parent a495bbb967
commit a87756e9b3
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -4,22 +4,14 @@
# From the off-tree build directory, invoke: # From the off-tree build directory, invoke:
# $ cmake <PATH_TO_OPENCV_ROOT> # $ cmake <PATH_TO_OPENCV_ROOT>
# #
#
# - OCT-2008: Initial version <joseluisblancoc@gmail.com>
#
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
include(cmake/OpenCVMinDepVersions.cmake) include(cmake/OpenCVMinDepVersions.cmake)
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) if(CMAKE_GENERATOR MATCHES Xcode AND XCODE_VERSION VERSION_GREATER 4.3)
cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
# -------------------------------------------------------------- else()
# Indicate CMake 2.7 and above that we don't want to mix relative cmake_minimum_required(VERSION "${MIN_VER_CMAKE}" FATAL_ERROR)
# and absolute paths in linker lib lists.
# Run "cmake --help-policy CMP0003" for more information.
# --------------------------------------------------------------
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
endif() endif()
# Following block can broke build in case of cross-compilng # Following block can broke build in case of cross-compilng
@ -43,16 +35,6 @@ else(NOT CMAKE_TOOLCHAIN_FILE)
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory") set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory")
endif(NOT CMAKE_TOOLCHAIN_FILE) endif(NOT CMAKE_TOOLCHAIN_FILE)
# --------------------------------------------------------------
# Top level OpenCV project
# --------------------------------------------------------------
if(CMAKE_GENERATOR MATCHES Xcode AND XCODE_VERSION VERSION_GREATER 4.3)
cmake_minimum_required(VERSION 2.8.8)
elseif(IOS)
cmake_minimum_required(VERSION 2.8.0)
else()
cmake_minimum_required(VERSION 2.6.3)
endif()
# must go before the project command # must go before the project command
set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE) set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)

1
cmake/OpenCVMinDepVersions.cmake
View File

@ -0,0 +1 @@
set(MIN_VER_CMAKE 2.8.7)