Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Build fixes for gcc 10 and 11 #16608

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ target_compile_options(
$<$<CXX_COMPILER_ID:GNU>:-Wno-error=maybe-uninitialized>
$<$<CXX_COMPILER_ID:GNU>:-Wno-error=return-type>
$<$<CXX_COMPILER_ID:GNU>:-Wno-error=unknown-pragmas>
$<$<CXX_COMPILER_ID:GNU>:-Wno-error=type-limits>
$<$<CXX_COMPILER_ID:AppleClang>:-Wno-error=deprecated-declarations>
$<$<CXX_COMPILER_ID:AppleClang>:-Wno-error=unused-parameter>
$<$<CXX_COMPILER_ID:AppleClang>:-Wno-error=unused-property-ivar>
Expand Down Expand Up @@ -972,6 +973,8 @@ include(${PROJECT_SOURCE_DIR}/vendor/unique_resource.cmake)
include(${PROJECT_SOURCE_DIR}/vendor/vector-tile.cmake)
include(${PROJECT_SOURCE_DIR}/vendor/wagyu.cmake)

find_package(Threads REQUIRED)

target_link_libraries(
mbgl-core
PRIVATE
Expand All @@ -991,6 +994,7 @@ target_link_libraries(
mbgl-vendor-unique_resource
mbgl-vendor-vector-tile
mbgl-vendor-wagyu
Threads::Threads
PUBLIC
Mapbox::Base
Mapbox::Base::Extras::expected-lite
Expand Down
1 change: 1 addition & 0 deletions include/mbgl/util/string.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <string>
#include <cstdlib>
#include <type_traits>
#include <exception>

// Polyfill needed by Qt when building for Android with GCC
#if defined(__ANDROID__) && defined(__GLIBCXX__)
Expand Down
2 changes: 1 addition & 1 deletion scripts/license.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

function(mbgl_generate_license param)
# Fake targets or non relevant.
set(BLACKLIST "mbgl-compiler-options")
set(BLACKLIST "mbgl-compiler-options" "Threads::Threads")

get_target_property(LIBRARIES ${param} LINK_LIBRARIES)
list(INSERT LIBRARIES 0 ${param})
Expand Down
2 changes: 1 addition & 1 deletion vendor/benchmark
Submodule benchmark updated 81 files
+32 −0 .github/ISSUE_TEMPLATE/bug_report.md
+20 −0 .github/ISSUE_TEMPLATE/feature_request.md
+30 −0 .github/workflows/bazel.yml
+38 −0 .github/workflows/build-and-test.yml
+26 −0 .github/workflows/pylint.yml
+24 −0 .github/workflows/test_bindings.yml
+5 −0 .gitignore
+3 −7 .travis.yml
+8 −0 AUTHORS
+2 −0 BUILD.bazel
+16 −5 CMakeLists.txt
+13 −1 CONTRIBUTORS
+227 −63 README.md
+45 −3 WORKSPACE
+1 −1 appveyor.yml
+3 −0 bindings/python/BUILD
+25 −0 bindings/python/build_defs.bzl
+38 −0 bindings/python/google_benchmark/BUILD
+158 −0 bindings/python/google_benchmark/__init__.py
+181 −0 bindings/python/google_benchmark/benchmark.cc
+136 −0 bindings/python/google_benchmark/example.py
+20 −0 bindings/python/pybind11.BUILD
+6 −0 bindings/python/python_headers.BUILD
+2 −0 bindings/python/requirements.txt
+7 −2 cmake/CXXFeatureCheck.cmake
+1 −1 cmake/GoogleTest.cmake
+1 −1 cmake/GoogleTest.cmake.in
+2 −2 cmake/benchmark.pc.in
+0 −7 conan/CMakeLists.txt
+0 −10 conan/test_package/CMakeLists.txt
+0 −19 conan/test_package/conanfile.py
+0 −18 conan/test_package/test_package.cpp
+0 −79 conanfile.py
+0 −0 docs/releasing.md
+5 −1 docs/tools.md
+55 −16 include/benchmark/benchmark.h
+0 −320 mingw.py
+2 −0 requirements.txt
+140 −0 setup.py
+4 −2 src/CMakeLists.txt
+69 −64 src/benchmark.cc
+33 −17 src/benchmark_register.cc
+2 −1 src/benchmark_register.h
+9 −6 src/benchmark_runner.cc
+38 −32 src/commandlineflags.cc
+41 −11 src/commandlineflags.h
+10 −12 src/console_reporter.cc
+4 −0 src/counter.cc
+5 −0 src/counter.h
+53 −9 src/cycleclock.h
+9 −1 src/internal_macros.h
+6 −4 src/json_reporter.cc
+1 −1 src/mutex.h
+2 −2 src/reporter.cc
+16 −0 src/sleep.cc
+3 −0 src/string_util.cc
+43 −16 src/sysinfo.cc
+1 −1 src/thread_manager.h
+3 −3 src/thread_timer.h
+58 −22 src/timers.cc
+28 −20 test/BUILD
+34 −30 test/CMakeLists.txt
+77 −0 test/args_product_test.cc
+18 −3 test/basic_test.cc
+6 −0 test/benchmark_gtest.cc
+138 −15 test/commandlineflags_gtest.cc
+2 −0 test/complexity_test.cc
+8 −6 test/fixture_test.cc
+1 −0 test/options_test.cc
+15 −0 test/output_test_helper.cc
+123 −7 test/reporter_output_test.cc
+6 −0 test/skip_with_error_test.cc
+2 −2 test/statistics_gtest.cc
+7 −0 test/string_util_gtest.cc
+2 −0 test/user_counters_tabular_test.cc
+93 −0 test/user_counters_test.cc
+19 −0 tools/BUILD.bazel
+25 −4 tools/compare.py
+491 −129 tools/gbench/report.py
+2 −3 tools/gbench/util.py
+1 −0 tools/requirements.txt