diff options
| author | Peter Bell <peterbell10@live.co.uk> | 2020-05-09 17:51:54 +0200 |
|---|---|---|
| committer | peterbell10 <peterbell10@live.co.uk> | 2020-05-09 21:37:16 +0200 |
| commit | 1123c95cf2efdcb23ff557b956d58538ca24aefe (patch) | |
| tree | e8f39c2519ad06afc4f52d8fbc1d8fb334aeea42 /SetFlags.cmake | |
| parent | Update submodules (#4727) (diff) | |
| download | cuberite-1123c95cf2efdcb23ff557b956d58538ca24aefe.tar cuberite-1123c95cf2efdcb23ff557b956d58538ca24aefe.tar.gz cuberite-1123c95cf2efdcb23ff557b956d58538ca24aefe.tar.bz2 cuberite-1123c95cf2efdcb23ff557b956d58538ca24aefe.tar.lz cuberite-1123c95cf2efdcb23ff557b956d58538ca24aefe.tar.xz cuberite-1123c95cf2efdcb23ff557b956d58538ca24aefe.tar.zst cuberite-1123c95cf2efdcb23ff557b956d58538ca24aefe.zip | |
Diffstat (limited to '')
| -rw-r--r-- | SetFlags.cmake | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/SetFlags.cmake b/SetFlags.cmake index 9d8e11e2d..b8dd26bfd 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -74,11 +74,6 @@ macro(set_flags) ) 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") - #on os x clang adds pthread for us but we need to add it for gcc if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") add_flags_cxx("-stdlib=libc++") @@ -87,11 +82,6 @@ macro(set_flags) add_flags_cxx("-pthread") endif() elseif (ANDROID) - 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("-fsigned-char") else() # Let gcc / clang know that we're compiling a multi-threaded app: @@ -107,11 +97,6 @@ macro(set_flags) ) 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") |