summaryrefslogtreecommitdiff
path: root/cmake/mbgl.cmake
diff options
context:
space:
mode:
authorLangston Smith <langston.smith@mapbox.com>2017-12-15 18:48:25 -0800
committerLangston Smith <langston.smith@mapbox.com>2017-12-15 18:48:25 -0800
commit99628527e2dc3096482e39a8bfcde4c539f12389 (patch)
tree72833260d5f3fda5bd78f77b335ce0606b55251f /cmake/mbgl.cmake
parenta333cfe13aa4a00abd7b355890f47c03a1958e2e (diff)
parentf4021c4a2ee985e33bdd088985a22c591503d234 (diff)
downloadqtlocation-mapboxgl-upstream/ls-fixing-broken-android-plugin-links-in-javadocs.tar.gz
Merge branch 'master' into ls-fixing-broken-android-plugin-links-in-javadocsupstream/ls-fixing-broken-android-plugin-links-in-javadocs
Diffstat (limited to 'cmake/mbgl.cmake')
-rw-r--r--cmake/mbgl.cmake9
1 files changed, 6 insertions, 3 deletions
diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake
index d853950c0d..0393ff366e 100644
--- a/cmake/mbgl.cmake
+++ b/cmake/mbgl.cmake
@@ -143,11 +143,14 @@ macro(initialize_xcode_cxx_build_settings target)
# -Wshadow
set_xcode_property(${target} GCC_WARN_SHADOW YES)
- # -Wno-unknown-pragmas
- set_xcode_property(${target} GCC_WARN_UNKNOWN_PRAGMAS YES)
-
# -Wnon-virtual-dtor
set_xcode_property(${target} GCC_WARN_NON_VIRTUAL_DESTRUCTOR YES)
+
+ # -Wnon-literal-conversion
+ set_xcode_property(${target} CLANG_WARN_NON_LITERAL_NULL_CONVERSION YES)
+
+ # -Wrange-loop-analysis
+ set_xcode_property(${target} CLANG_WARN_RANGE_LOOP_ANALYSIS YES)
endmacro(initialize_xcode_cxx_build_settings)
# CMake 3.1 does not have this yet.