PVReaders: Updated CMakeLists.txt files to support any Qt version ParaView is compiled with

This commit is contained in:
Henry Weller
2024-06-06 22:09:56 +01:00
parent ffa58374db
commit 1078006b21
4 changed files with 12 additions and 12 deletions

View File

@ -31,7 +31,7 @@ INCLUDE_DIRECTORIES(
) )
ADD_DEFINITIONS( ADD_DEFINITIONS(
-std=c++14 -std=c++17
-DWM_$ENV{WM_PRECISION_OPTION} -DWM_$ENV{WM_PRECISION_OPTION}
-DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE} -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE}
) )
@ -81,7 +81,7 @@ IF(${ParaView_VERSION} VERSION_LESS 5.5)
OpenFOAM OpenFOAM
) )
ELSE() 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 # in order for the headers to be available
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
${TARGET_NAME} ${TARGET_NAME}
@ -89,7 +89,7 @@ ELSE()
vtkPVFoam vtkPVFoam
finiteVolume finiteVolume
OpenFOAM OpenFOAM
Qt5::Core Qt${PARAVIEW_QT_MAJOR_VERSION}::Core
Qt5::Gui Qt${PARAVIEW_QT_MAJOR_VERSION}::Gui
) )
ENDIF() ENDIF()

View File

@ -12,6 +12,6 @@ TARGET_LINK_LIBRARIES(
vtkPVFoam vtkPVFoam
finiteVolume finiteVolume
OpenFOAM OpenFOAM
Qt5::Core Qt${PARAVIEW_QT_MAJOR_VERSION}::Core
Qt5::Gui Qt${PARAVIEW_QT_MAJOR_VERSION}::Gui
) )

View File

@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES(
) )
ADD_DEFINITIONS( ADD_DEFINITIONS(
-std=c++14 -std=c++17
-DWM_$ENV{WM_PRECISION_OPTION} -DWM_$ENV{WM_PRECISION_OPTION}
-DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE} -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE}
) )
@ -79,14 +79,14 @@ IF(${ParaView_VERSION} VERSION_LESS 5.5)
OpenFOAM OpenFOAM
) )
ELSE() 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 # in order for the headers to be available
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
${TARGET_NAME} ${TARGET_NAME}
LINK_PUBLIC LINK_PUBLIC
vtkPVblockMesh vtkPVblockMesh
OpenFOAM OpenFOAM
Qt5::Core Qt${PARAVIEW_QT_MAJOR_VERSION}::Core
Qt5::Gui Qt${PARAVIEW_QT_MAJOR_VERSION}::Gui
) )
ENDIF() ENDIF()

View File

@ -11,6 +11,6 @@ TARGET_LINK_LIBRARIES(
LINK_PUBLIC LINK_PUBLIC
vtkPVblockMesh vtkPVblockMesh
OpenFOAM OpenFOAM
Qt5::Core Qt${PARAVIEW_QT_MAJOR_VERSION}::Core
Qt5::Gui Qt${PARAVIEW_QT_MAJOR_VERSION}::Gui
) )