diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt index 2b7d1c724b..a587d33f34 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/CMakeLists.txt @@ -49,7 +49,7 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS XML_GROUP sources ) -IF("${PARAVIEW_VERSION_MINOR}" LESS 1) +IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0) ADD_PARAVIEW_PLUGIN( PV4FoamReader_SM "1.0" SERVER_MANAGER_XML PV4FoamReader_SM.xml @@ -59,7 +59,7 @@ IF("${PARAVIEW_VERSION_MINOR}" LESS 1) ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} GUI_RESOURCE_FILES PV4FoamReader.xml ) -ELSE("${PARAVIEW_VERSION_MINOR}" LESS 1) +ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0) ADD_PARAVIEW_PLUGIN( PV4FoamReader_SM "1.0" SERVER_MANAGER_XML PV4FoamReader_SM.xml @@ -68,7 +68,7 @@ ELSE("${PARAVIEW_VERSION_MINOR}" LESS 1) GUI_SOURCES pqPV4FoamReaderPanel.cxx ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} ) -ENDIF("${PARAVIEW_VERSION_MINOR}" LESS 1) +ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0) TARGET_LINK_LIBRARIES( PV4FoamReader_SM diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml index 8c69ea23a5..d2856ad46d 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/PV4FoamReader/PV4FoamReader_SM.xml @@ -286,7 +286,7 @@ + file_description="OpenFOAM"/> diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt index 4f4a810d5c..21ee1a3f79 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/CMakeLists.txt @@ -48,32 +48,26 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS XML_GROUP sources ) -ADD_PARAVIEW_PLUGIN( - PV4blockMeshReader_SM "1.0" - SERVER_MANAGER_XML PV4blockMeshReader_SM.xml - SERVER_MANAGER_SOURCES vtkPV4blockMeshReader.cxx - GUI_INTERFACES ${IFACES} - GUI_SOURCES pqPV4blockMeshReaderPanel.cxx - ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} - GUI_RESOURCE_FILES PV4blockMeshReader.xml -) - - -# # -# # Define the server-side portion of the reader plugin -# # -# ADD_PARAVIEW_PLUGIN(PV4blockMeshReader_SM "1.0" -# SERVER_MANAGER_XML PV4blockMeshReader_SM.xml -# SERVER_MANAGER_SOURCES vtkPV4blockMeshReader.cxx -# ) -# # -# # Define the client-side portion of the reader plugin -# # -# ADD_PARAVIEW_PLUGIN( -# PV4blockMeshReader "1.0" -# GUI_RESOURCES PV4blockMeshReader.qrc -# ) - +IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0) + ADD_PARAVIEW_PLUGIN( + PV4blockMeshReader_SM "1.0" + SERVER_MANAGER_XML PV4blockMeshReader_SM.xml + SERVER_MANAGER_SOURCES vtkPV4blockMeshReader.cxx + GUI_INTERFACES ${IFACES} + GUI_SOURCES pqPV4blockMeshReaderPanel.cxx + ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} + GUI_RESOURCE_FILES PV4blockMeshReader.xml + ) +ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0) + ADD_PARAVIEW_PLUGIN( + PV4blockMeshReader_SM "1.0" + SERVER_MANAGER_XML PV4blockMeshReader_SM.xml + SERVER_MANAGER_SOURCES vtkPV4blockMeshReader.cxx + GUI_INTERFACES ${IFACES} + GUI_SOURCES pqPV4blockMeshReaderPanel.cxx + ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} + ) +ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0) # Build the client-side plugin @@ -83,4 +77,5 @@ TARGET_LINK_LIBRARIES( blockMesh vtkPV4blockMesh ) + #----------------------------------------------------------------------------- diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader_SM.xml b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader_SM.xml index cc288ac7ca..09f962d32f 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader_SM.xml +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4blockMeshReader/PV4blockMeshReader/PV4blockMeshReader_SM.xml @@ -103,6 +103,8 @@ +