AxioDL
/
zeus
mirror of https://github.com/AxioDL/zeus.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apply CMAKE_CXX_STANDARD

This commit is contained in:
Jack Andersen 2017-06-17 16:53:08 -10:00
parent 328a1519a0
commit e4a8fc868b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) # because of CMAKE_CXX_STANDARD
project(zeus) project(zeus)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if (NOT DEFINED ATHENA_INCLUDE_DIR) if (NOT DEFINED ATHENA_INCLUDE_DIR)
set(ATHENA_INCLUDE_DIR ../athena/include) set(ATHENA_INCLUDE_DIR ../athena/include)
endif() endif()
@ -25,7 +28,7 @@ set(SOURCES
# SSELegacy.cpp compiled separately to escape the effects of link-time optimization # SSELegacy.cpp compiled separately to escape the effects of link-time optimization
if(NOT MSVC) if(NOT MSVC)
set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS "-msse4.1 -msse4.2 -std=c++14") set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS "-msse4.1 -msse4.2")
if(CUSTOM_FLAGS) if(CUSTOM_FLAGS)
string(REPLACE "-flto=thin" "" CUSTOM_FLAGS ${CMAKE_CXX_FLAGS}) string(REPLACE "-flto=thin" "" CUSTOM_FLAGS ${CMAKE_CXX_FLAGS})
endif(CUSTOM_FLAGS) endif(CUSTOM_FLAGS)

5
test/CMakeLists.txt
View File

@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) # because of CMAKE_CXX_STANDARD
project(zeustest) project(zeustest)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
include_directories(../include) include_directories(../include)
add_executable(zeustest main.cpp) add_executable(zeustest main.cpp)