diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2016-11-07 23:15:07 +0100 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2016-12-12 15:32:32 +0100 |
| commit | 8c6d0b51c719e1817e308375d129b17ede3b82fc (patch) | |
| tree | 8aa23d1db5e4198f6aeed5091ad6adedc12fea35 /SetFlags.cmake | |
| parent | Merge pull request #3476 from Seadragon91/patch-1 (diff) | |
| download | cuberite-8c6d0b51c719e1817e308375d129b17ede3b82fc.tar cuberite-8c6d0b51c719e1817e308375d129b17ede3b82fc.tar.gz cuberite-8c6d0b51c719e1817e308375d129b17ede3b82fc.tar.bz2 cuberite-8c6d0b51c719e1817e308375d129b17ede3b82fc.tar.lz cuberite-8c6d0b51c719e1817e308375d129b17ede3b82fc.tar.xz cuberite-8c6d0b51c719e1817e308375d129b17ede3b82fc.tar.zst cuberite-8c6d0b51c719e1817e308375d129b17ede3b82fc.zip | |
Diffstat (limited to 'SetFlags.cmake')
| -rw-r--r-- | SetFlags.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/SetFlags.cmake b/SetFlags.cmake index 357cb9e7c..7ccba4f72 100644 --- a/SetFlags.cmake +++ b/SetFlags.cmake @@ -86,7 +86,13 @@ macro(set_flags) else() add_flags_cxx("-pthread") endif() - + elseif (ANDROID) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++14") + set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} -std=c++14") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++14") + + add_flags_cxx("-fsigned-char") else() # Let gcc / clang know that we're compiling a multi-threaded app: if (${UNIX}) @@ -300,6 +306,7 @@ macro(set_exe_flags) endif() endif() add_flags_cxx("-Wno-error=unused-command-line-argument") + add_flags_cxx("-Wno-documentation-unknown-command") endif() endif() |