diff options
| -rw-r--r-- | cmake/benchmark.cmake | 2 | ||||
| -rw-r--r-- | cmake/core.cmake | 2 | ||||
| -rw-r--r-- | cmake/glfw.cmake | 2 | ||||
| -rw-r--r-- | cmake/mbgl.cmake | 26 | ||||
| -rw-r--r-- | cmake/node.cmake | 2 | ||||
| -rw-r--r-- | cmake/render.cmake | 2 | ||||
| -rw-r--r-- | cmake/test.cmake | 2 |
7 files changed, 38 insertions, 0 deletions
diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake index 79e87a0b10..87351e97b1 100644 --- a/cmake/benchmark.cmake +++ b/cmake/benchmark.cmake @@ -27,6 +27,8 @@ mbgl_platform_benchmark() create_source_groups(mbgl-benchmark) +initialize_xcode_cxx_build_settings(mbgl-benchmark) + xcode_create_scheme( TARGET mbgl-benchmark OPTIONAL_ARGS diff --git a/cmake/core.cmake b/cmake/core.cmake index ff2b4ba53c..c4e711f558 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -34,3 +34,5 @@ mbgl_platform_core() create_source_groups(mbgl-core) xcode_create_scheme(TARGET mbgl-core) + +initialize_xcode_cxx_build_settings(mbgl-core) diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake index dd73b54eef..29d8d2ba94 100644 --- a/cmake/glfw.cmake +++ b/cmake/glfw.cmake @@ -34,6 +34,8 @@ mbgl_platform_glfw() create_source_groups(mbgl-glfw) +initialize_xcode_cxx_build_settings(mbgl-glfw) + xcode_create_scheme( TARGET mbgl-glfw OPTIONAL_ARGS diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index 9ef2ddd306..7f7d820a68 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -114,6 +114,32 @@ function(write_xcconfig_target_properties) ) endfunction() +# Set Xcode project build settings to be consistent with the CXX flags we're +# using. (Otherwise, Xcode's defaults may override some of these.) +macro(initialize_xcode_cxx_build_settings target) + # -Wall + set_xcode_property(${target} GCC_WARN_SIGN_COMPARE YES) + set_xcode_property(${target} GCC_WARN_UNINITIALIZED_AUTOS YES) + set_xcode_property(${target} GCC_WARN_UNKNOWN_PRAGMAS YES) + set_xcode_property(${target} GCC_WARN_UNUSED_FUNCTION YES) + set_xcode_property(${target} GCC_WARN_UNUSED_LABEL YES) + set_xcode_property(${target} GCC_WARN_UNUSED_PARAMETER YES) + set_xcode_property(${target} GCC_WARN_UNUSED_VARIABLE YES) + + # -Wextra + set_xcode_property(${target} CLANG_WARN_EMPTY_BODY YES) + set_xcode_property(${target} GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS YES) + + # -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) +endmacro(initialize_xcode_cxx_build_settings) + # CMake 3.1 does not have this yet. set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14") set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14") diff --git a/cmake/node.cmake b/cmake/node.cmake index 502edd8293..5a6c7595ad 100644 --- a/cmake/node.cmake +++ b/cmake/node.cmake @@ -54,6 +54,8 @@ mbgl_platform_node() create_source_groups(mbgl-node) +initialize_xcode_cxx_build_settings(mbgl-node) + xcode_create_scheme( TARGET mbgl-node ) diff --git a/cmake/render.cmake b/cmake/render.cmake index 407e1ca8ef..f69aed16c0 100644 --- a/cmake/render.cmake +++ b/cmake/render.cmake @@ -21,6 +21,8 @@ mbgl_platform_render() create_source_groups(mbgl-render) +initialize_xcode_cxx_build_settings(mbgl-render) + xcode_create_scheme( TARGET mbgl-render OPTIONAL_ARGS diff --git a/cmake/test.cmake b/cmake/test.cmake index 5e404577ed..c821d53316 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -41,6 +41,8 @@ mbgl_platform_test() create_source_groups(mbgl-test) +initialize_xcode_cxx_build_settings(mbgl-test) + xcode_create_scheme( TARGET mbgl-test OPTIONAL_ARGS |