Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update mini_chromium to remove a left-over <span> include #117

Merged
merged 14 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from 13 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
28 changes: 25 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,26 @@ jobs:
fail-fast: false
matrix:
include:
- name: Ubuntu
platform: ubuntu-latest
- name: Ubuntu (GCC 13.3.0)
platform: ubuntu-24.04
CC: gcc
CXX: g++
- name: Ubuntu (GCC 11.4.0)
platform: ubuntu-22.04
CC: gcc
CXX: g++
- name: Ubuntu (GCC 9.4.0)
platform: ubuntu-20.04
CC: gcc
CXX: g++
- name: Ubuntu (clang 18.1.3)
platform: ubuntu-24.04
CC: clang
CXX: clang++
- name: Ubuntu (clang 14.0.0)
platform: ubuntu-22.04
CC: clang
CXX: clang++
- name: Windows (x64)
platform: windows-latest
- name: Windows (arm64)
Expand Down Expand Up @@ -45,7 +63,7 @@ jobs:
if: ${{ runner.os == 'Linux' }}
run: |
sudo apt update
sudo apt install zlib1g-dev libcurl4-openssl-dev libssl-dev libunwind-dev pkg-config
sudo apt install clang zlib1g-dev libcurl4-openssl-dev libssl-dev libunwind-dev pkg-config

- name: Installing LLVM-MINGW Dependencies
if: ${{ runner.os == 'Windows' && matrix.MINGW == '1' }}
Expand All @@ -58,13 +76,17 @@ jobs:
- name: Build crashpad
shell: bash
run: |
[ "${{ matrix.CC }}" ] && export CC="${{ matrix.CC }}"
[ "${{ matrix.CXX }}" ] && export CXX="${{ matrix.CXX }}"
echo "CMAKE_DEFINES=${CMAKE_DEFINES}"
cmake -B cmake-build -D CRASHPAD_BUILD_TOOLS=On ${CMAKE_DEFINES}
cmake --build cmake-build --parallel

- name: Build crashpad with client-side stack traces
shell: bash
run: |
[ "${{ matrix.CC }}" ] && export CC="${{ matrix.CC }}"
[ "${{ matrix.CXX }}" ] && export CXX="${{ matrix.CXX }}"
echo "CMAKE_DEFINES=${CMAKE_DEFINES}"
cmake -B cmake-build-stacks -D CRASHPAD_ENABLE_STACKTRACE=ON ${CMAKE_DEFINES}
cmake --build cmake-build-stacks --parallel
Expand Down
8 changes: 8 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@ elseif(MINGW)
# FIXME: cmake 3.13 added target_link_options
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -municode")
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(crashpad_interface INTERFACE
$<$<COMPILE_LANGUAGE:CXX>:-Wno-multichar>
$<$<COMPILE_LANGUAGE:CXX>:-Wno-attributes>
)
endif()

add_library(crashpad::interface ALIAS crashpad_interface)

add_subdirectory(compat)
Expand Down
6 changes: 0 additions & 6 deletions client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,6 @@ if(IOS)
)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(crashpad_client PRIVATE
"-Wno-multichar"
)
endif()

crashpad_install_target(crashpad_client)
crashpad_install_dev(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/crashpad/client"
Expand Down
11 changes: 5 additions & 6 deletions handler/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@ if(WIN32)
endif()
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(crashpad_handler_lib PRIVATE
"-Wno-multichar"
)
endif()

set_property(TARGET crashpad_handler_lib PROPERTY EXPORT_NAME handler)
add_library(crashpad::handler_lib ALIAS crashpad_handler_lib)

Expand All @@ -89,6 +83,11 @@ if(NOT IOS)
main.cc
)

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(crashpad_handler PRIVATE
$<$<COMPILE_LANGUAGE:CXX>:-Wno-ignored-attributes>
)
endif()
if(LINUX)
target_sources(crashpad_handler PRIVATE
../client/pthread_create_linux.cc
Expand Down
2 changes: 1 addition & 1 deletion third_party/mini_chromium/mini_chromium
10 changes: 10 additions & 0 deletions tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ if(CRASHPAD_BUILD_TOOLS)
NOMINMAX
)
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(dump_minidump_annotations PRIVATE
$<$<COMPILE_LANGUAGE:CXX>:-Wno-multichar>
)
endif()
crashpad_install_target(dump_minidump_annotations)

add_executable(crashpad_database_util
Expand Down Expand Up @@ -85,6 +90,11 @@ if(CRASHPAD_BUILD_TOOLS)
NOMINMAX
)
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(crashpad_generate_dump PRIVATE
$<$<COMPILE_LANGUAGE:CXX>:-Wno-multichar>
)
endif()
crashpad_install_target(crashpad_generate_dump)

if(APPLE)
Expand Down
7 changes: 0 additions & 7 deletions util/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -547,13 +547,6 @@ if(WIN32)
endif()
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(crashpad_util PRIVATE
$<$<COMPILE_LANGUAGE:CXX>:-Wno-multichar>
)
endif()


set_property(TARGET crashpad_util PROPERTY EXPORT_NAME util)
add_library(crashpad::util ALIAS crashpad_util)

Expand Down
Loading