walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix #11791 Build regression with GCC 13 (#5193) 

Patch supplied by Joachim Reichel.
This commit is contained in:
chrchr-github 2023-06-26 11:15:41 +02:00 committed by GitHub
parent 4ebb8eaf0c
commit f4030c4b1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/CI-unixish.yml vendored
View File

@ -85,6 +85,18 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install libxml2-utils qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser 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" # coreutils contains "nproc"
- name: Install missing software on macos - name: Install missing software on macos
if: contains(matrix.os, 'macos') if: contains(matrix.os, 'macos')

8
gui/CMakeLists.txt
View File

@ -9,10 +9,10 @@ CheckOptions:
- { key: HeaderFileExtensions, value: 'x' } - { key: HeaderFileExtensions, value: 'x' }
") ")
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:-DQT_NO_DEBUG>) add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:-DQT_NO_DEBUG_OUTPUT>) add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:-DQT_NO_WARNING_OUTPUT>) add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_WARNING_OUTPUT>)
add_compile_definitions($<$<CONFIG:Debug>:-DQT_DEBUG>) add_compile_definitions($<$<CONFIG:Debug>:QT_DEBUG>)
file(GLOB hdrs "*.h") file(GLOB hdrs "*.h")
file(GLOB srcs "*.cpp") file(GLOB srcs "*.cpp")

8
tools/triage/CMakeLists.txt
View File

@ -8,10 +8,10 @@ CheckOptions:
- { key: HeaderFileExtensions, value: 'x' } - { key: HeaderFileExtensions, value: 'x' }
") ")
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:-DQT_NO_DEBUG>) add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:-DQT_NO_DEBUG_OUTPUT>) add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>)
add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:-DQT_NO_WARNING_OUTPUT>) add_compile_definitions($<$<NOT:$<CONFIG:Debug>>:QT_NO_WARNING_OUTPUT>)
add_compile_definitions($<$<CONFIG:Debug>:-DQT_DEBUG>) add_compile_definitions($<$<CONFIG:Debug>:QT_DEBUG>)
file(GLOB hdrs "*.h") file(GLOB hdrs "*.h")
file(GLOB srcs "*.cpp") file(GLOB srcs "*.cpp")