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

Merge pull request #9215 from alalek:cmake_min_version

Browse Source
pull/9221/merge
Alexander Alekhin 8 years ago
parent 8e6e05ed3f 92f182bc3b
commit 174cb06a7a
2 changed files with 2 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. 2
      CMakeLists.txt
  2. 2
      cmake/OpenCVMinDepVersions.cmake

2
CMakeLists.txt
Unescape View File

@ -18,7 +18,7 @@ endif()
include(cmake/OpenCVMinDepVersions.cmake) include(cmake/OpenCVMinDepVersions.cmake)
if(CMAKE_GENERATOR MATCHES Xcode AND XCODE_VERSION VERSION_GREATER 4.3) if(CMAKE_GENERATOR MATCHES Xcode AND XCODE_VERSION VERSION_GREATER 4.3)
cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
elseif(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore) elseif(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
cmake_minimum_required(VERSION 3.1 FATAL_ERROR) cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
#Required to resolve linker error issues due to incompatibility with CMake v3.0+ policies. #Required to resolve linker error issues due to incompatibility with CMake v3.0+ policies.

2
cmake/OpenCVMinDepVersions.cmake
Unescape View File

@ -1,4 +1,4 @@
set(MIN_VER_CMAKE 2.8.7) set(MIN_VER_CMAKE 2.8.12.2)
set(MIN_VER_CUDA 6.5) set(MIN_VER_CUDA 6.5)
set(MIN_VER_PYTHON2 2.6) set(MIN_VER_PYTHON2 2.6)
set(MIN_VER_PYTHON3 3.2) set(MIN_VER_PYTHON3 3.2)

Write Preview
Loading…
Cancel
Save