From 1078006b217a080f76e7b7b54f58f16afd92c07f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 6 Jun 2024 22:09:56 +0100
Subject: [PATCH] PVReaders: Updated CMakeLists.txt files to support any Qt
 version ParaView is compiled with

---
 .../graphics/PVReaders/PVFoamReader/CMakeLists.txt        | 8 ++++----
 .../graphics/PVReaders/PVFoamReader/vtk/CMakeLists.txt    | 4 ++--
 .../graphics/PVReaders/PVblockMeshReader/CMakeLists.txt   | 8 ++++----
 .../PVReaders/PVblockMeshReader/vtk/CMakeLists.txt        | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt
index 4680499fb1..eeaaa7e6ee 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt
@@ -31,7 +31,7 @@ INCLUDE_DIRECTORIES(
 )
 
 ADD_DEFINITIONS(
-    -std=c++14
+    -std=c++17
     -DWM_$ENV{WM_PRECISION_OPTION}
     -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE}
 )
@@ -81,7 +81,7 @@ IF(${ParaView_VERSION} VERSION_LESS 5.5)
         OpenFOAM
     )
 ELSE()
-    # Paraview-5.5.x and higher needs QT-5 libraries listed in the link command
+    # Paraview-5.5.x and higher needs QT libraries listed in the link command
     # in order for the headers to be available
     TARGET_LINK_LIBRARIES(
         ${TARGET_NAME}
@@ -89,7 +89,7 @@ ELSE()
         vtkPVFoam
         finiteVolume
         OpenFOAM
-        Qt5::Core
-        Qt5::Gui
+        Qt${PARAVIEW_QT_MAJOR_VERSION}::Core
+        Qt${PARAVIEW_QT_MAJOR_VERSION}::Gui
     )
 ENDIF()
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtk/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtk/CMakeLists.txt
index d17de423b5..364ab0772a 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtk/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtk/CMakeLists.txt
@@ -12,6 +12,6 @@ TARGET_LINK_LIBRARIES(
     vtkPVFoam
     finiteVolume
     OpenFOAM
-    Qt5::Core
-    Qt5::Gui
+    Qt${PARAVIEW_QT_MAJOR_VERSION}::Core
+    Qt${PARAVIEW_QT_MAJOR_VERSION}::Gui
 )
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/CMakeLists.txt
index d366e663b3..9de9eba5ab 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/CMakeLists.txt
@@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES(
 )
 
 ADD_DEFINITIONS(
-    -std=c++14
+    -std=c++17
     -DWM_$ENV{WM_PRECISION_OPTION}
     -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE}
 )
@@ -79,14 +79,14 @@ IF(${ParaView_VERSION} VERSION_LESS 5.5)
         OpenFOAM
     )
 ELSE()
-    # Paraview-5.5.x and higher needs QT-5 libraries listed in the link command
+    # Paraview-5.5.x and higher needs QT libraries listed in the link command
     # in order for the headers to be available
     TARGET_LINK_LIBRARIES(
         ${TARGET_NAME}
         LINK_PUBLIC
         vtkPVblockMesh
         OpenFOAM
-        Qt5::Core
-        Qt5::Gui
+        Qt${PARAVIEW_QT_MAJOR_VERSION}::Core
+        Qt${PARAVIEW_QT_MAJOR_VERSION}::Gui
     )
 ENDIF()
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtk/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtk/CMakeLists.txt
index b1bd8f9dd1..021cef7842 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtk/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtk/CMakeLists.txt
@@ -11,6 +11,6 @@ TARGET_LINK_LIBRARIES(
     LINK_PUBLIC
     vtkPVblockMesh
     OpenFOAM
-    Qt5::Core
-    Qt5::Gui
+    Qt${PARAVIEW_QT_MAJOR_VERSION}::Core
+    Qt${PARAVIEW_QT_MAJOR_VERSION}::Gui
 )