Use C++17

This commit is contained in:
LordGrey 2023-09-10 18:07:44 +02:00
parent a205a188f1
commit 2cde6a4d8f
1 changed files with 15 additions and 17 deletions

View File

@ -38,8 +38,7 @@ if ( CCACHE_FOUND )
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
endif(CCACHE_FOUND) endif(CCACHE_FOUND)
# enable C++14; MSVC doesn't have c++14 feature switch # enable C++17
if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
if(APPLE) if(APPLE)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("Werror=unguarded-availability" REQUIRED_UNGUARDED_AVAILABILITY) CHECK_CXX_COMPILER_FLAG("Werror=unguarded-availability" REQUIRED_UNGUARDED_AVAILABILITY)
@ -53,10 +52,9 @@ if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-psabi") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-psabi")
endif() endif()
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 17)
set(CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
endif()
# Set build variables # Set build variables
# Grabber # Grabber