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.

Sign up for GitHub

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

Jump to bottom

Fix #11791 Build regression with GCC 13 #5193

Merged
merged 2 commits into from
Jun 26, 2023
Merged

Fix #11791 Build regression with GCC 13 #5193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
850a943
Fix #11791 Build regression with GCC 13
chrchr-github Jun 25, 2023
2e3f50f
Use GCC 13 in CI
chrchr-github Jun 25, 2023
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
12 changes: 12 additions & 0 deletions .github/workflows/CI-unixish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,18 @@ jobs:
sudo apt-get update
sudo apt-get install libxml2-utils qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser

- name: Set up GCC
uses: egor-tensin/setup-gcc@v1
if: matrix.os == 'ubuntu-22.04'
with:
version: 13
platform: x64

- name: Select compiler
run: |
echo "CXX=g++-13" >> $GITHUB_ENV
if: matrix.os == 'ubuntu-22.04'

# coreutils contains "nproc"
- name: Install missing software on macos
if: contains(matrix.os, 'macos')
Expand Down
8 changes: 4 additions & 4 deletions gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ CheckOptions:
- { key: HeaderFileExtensions, value: 'x' }
")

add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:-DQT_NO_DEBUG>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:-DQT_NO_DEBUG_OUTPUT>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:-DQT_NO_WARNING_OUTPUT>)
add_compile_definitions($<$<CONFIG:Debug>:-DQT_DEBUG>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_WARNING_OUTPUT>)
add_compile_definitions($<$<CONFIG:Debug>:QT_DEBUG>)

file(GLOB hdrs "*.h")
file(GLOB srcs "*.cpp")
Expand Down
8 changes: 4 additions & 4 deletions tools/triage/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ CheckOptions:
- { key: HeaderFileExtensions, value: 'x' }
")

add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:-DQT_NO_DEBUG>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:-DQT_NO_DEBUG_OUTPUT>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:-DQT_NO_WARNING_OUTPUT>)
add_compile_definitions($<$<CONFIG:Debug>:-DQT_DEBUG>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_WARNING_OUTPUT>)
add_compile_definitions($<$<CONFIG:Debug>:QT_DEBUG>)

file(GLOB hdrs "*.h")
file(GLOB srcs "*.cpp")
Expand Down