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

cmake: Move C++ standard requirement out of global scope to Source/

This commit is contained in:
Florent Castelli 2017-01-20 17:44:23 +01:00
parent 25c779943b
commit 4785802b9e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -1057,16 +1057,6 @@ enable_testing()
add_custom_target(unittests) add_custom_target(unittests)
add_custom_command(TARGET unittests POST_BUILD COMMAND ${CMAKE_CTEST_COMMAND}) add_custom_command(TARGET unittests POST_BUILD COMMAND ${CMAKE_CTEST_COMMAND})
########################################
# Start compiling our code
#
add_definitions(-std=c++1y)
# These aren't actually needed for C11/C++11
# but some dependencies require them (LLVM, libav).
add_definitions(-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)
add_subdirectory(Source) add_subdirectory(Source)

10
Source/CMakeLists.txt
View File

@ -1,3 +1,13 @@
check_and_add_flag(CXX14 -std=c++14)
if(NOT FLAG_CXX_CXX14)
check_and_add_flag(HAS_CXX1Y -std=c++1y)
endif()
# These aren't actually needed for C11/C++11
# but some dependencies require them (LLVM, libav).
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-D__STDC_CONSTANT_MACROS)
set(CMAKE_FAKELANG_CREATE_STATIC_LIBRARY "touch <TARGET>") set(CMAKE_FAKELANG_CREATE_STATIC_LIBRARY "touch <TARGET>")
if(ENABLE_PCH) if(ENABLE_PCH)
# This is actually a .h file, but trick cmake into compiling it as a source file # This is actually a .h file, but trick cmake into compiling it as a source file