mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 10:21:11 +00:00
Merge branch 'require_cpp17' into 'master'
C++17; make it count See merge request OpenMW/openmw!362
This commit is contained in:
commit
0d21ab6bbe
@ -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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user