diff options
| author | Mattes D <github@xoft.cz> | 2014-01-17 22:59:58 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-01-17 22:59:58 +0100 |
| commit | 9aca5b4b999ed671e3027a3c09582ff50ea8ebde (patch) | |
| tree | b8654ecb66295b21cb36ed50822d4cb0ca628240 | |
| parent | Merge pull request #554 from worktycho/compression (diff) | |
| parent | Changed std to c++11 in clang to fix va_copy issues (diff) | |
| download | cuberite-9aca5b4b999ed671e3027a3c09582ff50ea8ebde.tar cuberite-9aca5b4b999ed671e3027a3c09582ff50ea8ebde.tar.gz cuberite-9aca5b4b999ed671e3027a3c09582ff50ea8ebde.tar.bz2 cuberite-9aca5b4b999ed671e3027a3c09582ff50ea8ebde.tar.lz cuberite-9aca5b4b999ed671e3027a3c09582ff50ea8ebde.tar.xz cuberite-9aca5b4b999ed671e3027a3c09582ff50ea8ebde.tar.zst cuberite-9aca5b4b999ed671e3027a3c09582ff50ea8ebde.zip | |
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f2ad8b364..4ddd34db3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,7 @@ elseif(APPLE) #on os x clang adds pthread for us but we need to add it for gcc if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") add_flags_cxx("-pthread") + add_flags_cxx("-std=c++11") endif() else() # Let gcc / clang know that we're compiling a multi-threaded app: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b3af6aedd..275099540 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,10 +2,6 @@ cmake_minimum_required (VERSION 2.8.2) project (MCServer) -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03") -endif() - include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/") include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/jsoncpp/include") |