zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PVReaders: Fix for older versions of ParaView in which Qt major version is not defined

Browse Source
This commit is contained in:
Will Bainbridge
2024-06-11 09:25:32 +01:00
parent b986611242
commit bb43dbe270
4 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt
View File

@ -81,6 +81,11 @@ IF(${ParaView_VERSION} VERSION_LESS 5.5)
OpenFOAM OpenFOAM
) )
ELSE() ELSE()
# Assume QT version 5 if it hasn't been defined
IF(NOT PARAVIEW_QT_MAJOR_VERSION)
set(PARAVIEW_QT_MAJOR_VERSION 5)
ENDIF()
# Paraview-5.5.x and higher needs QT 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 # in order for the headers to be available
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(

4
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtk/CMakeLists.txt
View File

@ -6,6 +6,10 @@ SET_TARGET_PROPERTIES(
LIBRARY_OUTPUT_DIRECTORY "$ENV{PV_PLUGIN_PATH}" LIBRARY_OUTPUT_DIRECTORY "$ENV{PV_PLUGIN_PATH}"
) )
IF(NOT PARAVIEW_QT_MAJOR_VERSION)
set(PARAVIEW_QT_MAJOR_VERSION 5)
ENDIF()
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
PVFoamReader_VTK PVFoamReader_VTK
LINK_PUBLIC LINK_PUBLIC

5
applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/CMakeLists.txt
View File

@ -79,6 +79,11 @@ IF(${ParaView_VERSION} VERSION_LESS 5.5)
OpenFOAM OpenFOAM
) )
ELSE() ELSE()
# Assume QT version 5 if it hasn't been defined
IF(NOT PARAVIEW_QT_MAJOR_VERSION)
set(PARAVIEW_QT_MAJOR_VERSION 5)
ENDIF()
# Paraview-5.5.x and higher needs QT 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 # in order for the headers to be available
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(

4
applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtk/CMakeLists.txt
View File

@ -6,6 +6,10 @@ SET_TARGET_PROPERTIES(
LIBRARY_OUTPUT_DIRECTORY "$ENV{PV_PLUGIN_PATH}" LIBRARY_OUTPUT_DIRECTORY "$ENV{PV_PLUGIN_PATH}"
) )
IF(NOT PARAVIEW_QT_MAJOR_VERSION)
set(PARAVIEW_QT_MAJOR_VERSION 5)
ENDIF()
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
PVblockMeshReader_VTK PVblockMeshReader_VTK
LINK_PUBLIC LINK_PUBLIC