ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4703 from ligfx/cmake_cxx_standard 

CMake: Use CMAKE_CXX_STANDARD instead of passing -std=c++14
This commit is contained in:
Anthony 2017-03-15 18:04:28 -07:00 committed by GitHub
parent 8e6d256722 c4640295b1
commit 3b1dae5642
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/CMakeLists.txt
View File

@ -1,7 +1,6 @@
check_and_add_flag(CXX14 -std=c++14)
if(NOT FLAG_CXX_CXX14)
check_and_add_flag(HAS_CXX1Y -std=c++1y)
endif()
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
add_definitions(-DNOMINMAX)