CONFIG: adjustments for CMake files

- drop plugin support for Qt4 (old paraview)

- handle upcoming changes in VTK version naming in CMake files
  * VTK_MAJOR_VERSION becomes VTK_VERSION_MAJOR etc.
This commit is contained in:
Mark Olesen
2019-10-04 11:48:03 +02:00
committed by Andrew Heather
parent c816ab7e03
commit f75e01c8c2
6 changed files with 39 additions and 29 deletions

View File

@ -33,11 +33,7 @@ set(
)
if (PARAVIEW_QT_VERSION VERSION_GREATER "4")
qt5_wrap_cpp(MOC_SRCS pqFoamReaderControls.h)
else()
qt4_wrap_cpp(MOC_SRCS pqFoamReaderControls.h)
endif()
qt5_wrap_cpp(MOC_SRCS pqFoamReaderControls.h)
add_paraview_property_group_widget(IFACES0 IFACES0_SRCS
TYPE "openfoam_reader_general_controls"

View File

@ -13,7 +13,9 @@ endif()
# Simple discovery and sanity checks
find_package(ParaView REQUIRED)
include(${PARAVIEW_USE_FILE})
if (PARAVIEW_USE_FILE)
include(${PARAVIEW_USE_FILE})
endif()
#-----------------------------------------------------------------------------

View File

@ -27,11 +27,7 @@ set(
)
if (PARAVIEW_QT_VERSION VERSION_GREATER "4")
qt5_wrap_cpp(MOC_SRCS pqFoamBlockMeshControls.h)
else()
qt4_wrap_cpp(MOC_SRCS pqFoamBlockMeshControls.h)
endif()
qt5_wrap_cpp(MOC_SRCS pqFoamBlockMeshControls.h)
add_paraview_property_group_widget(IFACES0 IFACES0_SRCS
TYPE "openfoam_blockMesh_general_controls"

View File

@ -13,7 +13,9 @@ endif()
# Simple discovery and sanity checks
find_package(ParaView REQUIRED)
include(${PARAVIEW_USE_FILE})
if (PARAVIEW_USE_FILE)
include(${PARAVIEW_USE_FILE})
endif()
#-----------------------------------------------------------------------------