mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 16:20:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'require_cpp17' into 'master'

Browse Source 
C++17; make it count

See merge request OpenMW/openmw!362
This commit is contained in:
psi29a 2020-10-21 21:24:02 +00:00
commit 0d21ab6bbe
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -1,5 +1,7 @@
project(OpenMW) project(OpenMW)
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
# for link time optimization, remove if cmake version is >= 3.9 # for link time optimization, remove if cmake version is >= 3.9
if(POLICY CMP0069) if(POLICY CMP0069)
@ -393,9 +395,6 @@ if (NOT WIN32 AND NOT APPLE)
"${OpenMW_BINARY_DIR}/org.openmw.cs.desktop") "${OpenMW_BINARY_DIR}/org.openmw.cs.desktop")
endif() endif()
# CXX Compiler settings
set(CMAKE_CXX_STANDARD 17)
if(OPENMW_LTO_BUILD) if(OPENMW_LTO_BUILD)
if(NOT CMAKE_VERSION VERSION_LESS 3.9) if(NOT CMAKE_VERSION VERSION_LESS 3.9)
include(CheckIPOSupported) include(CheckIPOSupported)