diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-11-16 10:53:54 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2018-11-28 14:49:44 +0100 |
| commit | a0b8f01c1baf640f34c0f46ba22efd399b7a0012 (patch) | |
| tree | 96d9cb1b5f0daaf21b2dad3d880a1dcf15dde37e /cmake | |
| parent | 46edc91656a4468ff05f2a7b33c5fb036ab449d6 (diff) | |
| download | qtlocation-mapboxgl-a0b8f01c1baf640f34c0f46ba22efd399b7a0012.tar.gz | |
[build] use newer compiler versions for some builds
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/mbgl.cmake | 2 | ||||
| -rw-r--r-- | cmake/sqlite.cmake | 1 | ||||
| -rw-r--r-- | cmake/test.cmake | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index 97517fb9c5..8eb065dd09 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -155,7 +155,7 @@ function(add_vendor_target NAME TYPE) foreach(FILE IN LISTS FILES) target_sources(${NAME} ${SOURCE_TYPE} "${CMAKE_CURRENT_SOURCE_DIR}/vendor/${NAME}/${FILE}") endforeach() - target_include_directories(${NAME} ${INCLUDE_TYPE} "${CMAKE_CURRENT_SOURCE_DIR}/vendor/${NAME}/include") + target_include_directories(${NAME} SYSTEM ${INCLUDE_TYPE} "${CMAKE_CURRENT_SOURCE_DIR}/vendor/${NAME}/include") create_source_groups(${NAME}) endfunction() diff --git a/cmake/sqlite.cmake b/cmake/sqlite.cmake index b099210c85..fd2d98d3e2 100644 --- a/cmake/sqlite.cmake +++ b/cmake/sqlite.cmake @@ -34,4 +34,5 @@ target_compile_definitions(sqlite target_compile_options(sqlite PRIVATE "-Wno-int-conversion" PRIVATE "-Wno-implicit-fallthrough" + PRIVATE "-Wno-cast-function-type" ) diff --git a/cmake/test.cmake b/cmake/test.cmake index 053ba92d76..4f7933ade2 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -8,6 +8,8 @@ else() add_executable(mbgl-test ${MBGL_TEST_FILES}) endif() +# GCC 8+ trips over GTest's way of defining Test functions +target_compile_options(mbgl-test PRIVATE -Wno-shadow) if(NOT WITH_NODEJS) target_compile_definitions(mbgl-test PRIVATE "-DTEST_HAS_SERVER=0") |