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

Patch supplied by Joachim Reichel.
danmar · Jun 26, 2023 · f4030c4 · f4030c4
1 parent 4ebb8ea
commit f4030c4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
@@ -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')

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
@@ -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")

diff --git a/tools/triage/CMakeLists.txt b/tools/triage/CMakeLists.txt
@@ -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")