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

apply CMAKE_CXX_STANDARD

This commit is contained in:
Jack Andersen 2017-06-17 16:50:55 -10:00
parent 40a26ae19d
commit 12e49581c1
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hecl/CMakeLists.txt
View File

@ -1,12 +1,16 @@
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) # because of CMAKE_CXX_STANDARD
project(hecl) project(hecl)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(MSVC) if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
# Shaddup MSVC # Shaddup MSVC
add_definitions(-DUNICODE=1 -D_UNICODE=1 -D_CRT_SECURE_NO_WARNINGS=1 /wd4267 /wd4244) add_definitions(-DUNICODE=1 -D_UNICODE=1 -D_CRT_SECURE_NO_WARNINGS=1 /wd4267 /wd4244)
else() else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wno-multichar -fno-exceptions") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-multichar -fno-exceptions")
endif() endif()
endif() endif()

2
hecl/extern/athena vendored

@ -1 +1 @@
Subproject commit f10c7c0ee3a6e7f7e553c589bbdc07642a61127a Subproject commit b1f73f0c337ad7fa040dfde8f6fdf7be53512875

2
hecl/extern/boo vendored

@ -1 +1 @@
Subproject commit 505f0fef7365c4fb80ba0f5fcfa4509988f85acf Subproject commit 4fbc8746b0680b4f720cce3651e1157e1e1724e7