zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ParaView: GUI resource files in plugins are no longer supported

Browse Source 
Patch contributed by Bruno Santos
Resolves bug-report http://bugs.openfoam.org/view.php?id=2192
This commit is contained in:
Henry Weller
2016-08-16 08:46:39 +01:00
parent caa354aa95
commit 72bd9fd6cd
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,10 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
XML_GROUP sources XML_GROUP sources
) )
IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0) IF("${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}" EQUAL 4.0)
# Special build options, specifically for ParaView 4.0.*
# Because as of 4.1.0, GUI_RESOURCE_FILES is no longer used.
ADD_PARAVIEW_PLUGIN( ADD_PARAVIEW_PLUGIN(
PVFoamReader_SM "1.0" PVFoamReader_SM "1.0"
SERVER_MANAGER_XML PVFoamReader_SM.xml SERVER_MANAGER_XML PVFoamReader_SM.xml
@ -61,7 +64,7 @@ IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
GUI_RESOURCE_FILES PVFoamReader.xml GUI_RESOURCE_FILES PVFoamReader.xml
) )
ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0) ELSE("${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}" EQUAL 4.0)
ADD_PARAVIEW_PLUGIN( ADD_PARAVIEW_PLUGIN(
PVFoamReader_SM "1.0" PVFoamReader_SM "1.0"
SERVER_MANAGER_XML PVFoamReader_SM.xml SERVER_MANAGER_XML PVFoamReader_SM.xml
@ -70,7 +73,7 @@ ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
GUI_SOURCES pqPVFoamReaderPanel.cxx GUI_SOURCES pqPVFoamReaderPanel.cxx
${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
) )
ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0) ENDIF("${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}" EQUAL 4.0)
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
PVFoamReader_SM PVFoamReader_SM

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

@ -50,7 +50,10 @@ ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
XML_GROUP sources XML_GROUP sources
) )
IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0) IF("${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}" EQUAL 4.0)
# Special build options, specifically for ParaView 4.0.*
# Because as of 4.1.0, GUI_RESOURCE_FILES is no longer used.
ADD_PARAVIEW_PLUGIN( ADD_PARAVIEW_PLUGIN(
PVblockMeshReader_SM "1.0" PVblockMeshReader_SM "1.0"
SERVER_MANAGER_XML PVblockMeshReader_SM.xml SERVER_MANAGER_XML PVblockMeshReader_SM.xml
@ -60,7 +63,7 @@ IF("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
GUI_RESOURCE_FILES PVblockMeshReader.xml GUI_RESOURCE_FILES PVblockMeshReader.xml
) )
ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0) ELSE("${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}" EQUAL 4.0)
ADD_PARAVIEW_PLUGIN( ADD_PARAVIEW_PLUGIN(
PVblockMeshReader_SM "1.0" PVblockMeshReader_SM "1.0"
SERVER_MANAGER_XML PVblockMeshReader_SM.xml SERVER_MANAGER_XML PVblockMeshReader_SM.xml
@ -69,7 +72,7 @@ ELSE("${PARAVIEW_VERSION_MINOR}" EQUAL 0)
GUI_SOURCES pqPVblockMeshReaderPanel.cxx GUI_SOURCES pqPVblockMeshReaderPanel.cxx
${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS} ${MOC_SRCS} ${UI_SRCS} ${IFACE_SRCS}
) )
ENDIF("${PARAVIEW_VERSION_MINOR}" EQUAL 0) ENDIF("${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}" EQUAL 4.0)
# Build the client-side plugin # Build the client-side plugin