diff options
| author | worktycho <work.tycho@gmail.com> | 2014-10-09 10:53:16 +0200 |
|---|---|---|
| committer | worktycho <work.tycho@gmail.com> | 2014-10-09 10:53:16 +0200 |
| commit | 5cf1ba092e11da8e49222a9606031c48c5b91337 (patch) | |
| tree | c95492143c79affed8b846d75ef5647867869768 | |
| parent | Merge pull request #1519 from mc-server/submodulize (diff) | |
| download | cuberite-5cf1ba092e11da8e49222a9606031c48c5b91337.tar cuberite-5cf1ba092e11da8e49222a9606031c48c5b91337.tar.gz cuberite-5cf1ba092e11da8e49222a9606031c48c5b91337.tar.bz2 cuberite-5cf1ba092e11da8e49222a9606031c48c5b91337.tar.lz cuberite-5cf1ba092e11da8e49222a9606031c48c5b91337.tar.xz cuberite-5cf1ba092e11da8e49222a9606031c48c5b91337.tar.zst cuberite-5cf1ba092e11da8e49222a9606031c48c5b91337.zip | |
| -rw-r--r-- | SetFlags.cmake | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/SetFlags.cmake b/SetFlags.cmake index 1827a4b66..bea830616 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -59,12 +59,13 @@ macro(set_flags) set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG") set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG") elseif(APPLE) + + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") + set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} -std=c++11") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11") #on os x clang adds pthread for us but we need to add it for gcc if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") - set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} -std=c++11") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11") add_flags_cxx("-stdlib=libc++") add_flags_lnk("-stdlib=libc++") else() @@ -77,13 +78,10 @@ macro(set_flags) add_flags_cxx("-pthread") endif() - # Make CLang use C++11, otherwise MSVC2008-supported extensions don't work ("override" keyword etc.): - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") - set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} -std=c++11") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11") - endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") + set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} -std=c++11") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11") # We use a signed char (fixes #640 on RasPi) add_flags_cxx("-fsigned-char") |