Merge pull request #1524 from psi29a/cmake_31

standerdise on 3.1.0
pull/331/head
scrawl 7 years ago committed by GitHub
commit 3d347730dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -24,16 +24,8 @@ if (USE_QT)
set_property(CACHE DESIRED_QT_VERSION PROPERTY STRINGS 4 5) set_property(CACHE DESIRED_QT_VERSION PROPERTY STRINGS 4 5)
endif() endif()
if (APPLE) # set the minimum required version across the board
# OS X build process relies on this fix: https://github.com/Kitware/CMake/commit/3df5147043d83aa09acd5c9ce31d5c602efb99db cmake_minimum_required(VERSION 3.1.0)
cmake_minimum_required(VERSION 3.1.0)
elseif (USE_QT AND DESIRED_QT_VERSION MATCHES 5)
# 2.8.11+ is required to make Qt5 happy and allow linking QtMain on Windows.
cmake_minimum_required(VERSION 2.8.11)
else()
# We probably support older versions than this.
cmake_minimum_required(VERSION 2.6)
endif()
project(OpenMW) project(OpenMW)

Loading…
Cancel
Save