diff --git a/src/paraview-plugins/Allwclean b/src/paraview-plugins/Allwclean index 4336df9dea9a1b55fd2a219bbd18f2beed67d355..405031c8cc2d1a977727d457693a248ff9501c42 100755 --- a/src/paraview-plugins/Allwclean +++ b/src/paraview-plugins/Allwclean @@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory get_pvplugin_api || echo "No ParaView plugin information found" 1>&2 # Cleanup libraries -wclean libso foamPv +wclean libso common wclean libso blockMeshReader/library wclean libso foamReader/library diff --git a/src/paraview-plugins/Allwmake b/src/paraview-plugins/Allwmake index 4e9cccfdb6a55d84dfe91457b1bce4e81d1b9f38..c81120f89369e4c51d5c6e5d2122c496e46b22b1 100755 --- a/src/paraview-plugins/Allwmake +++ b/src/paraview-plugins/Allwmake @@ -15,7 +15,7 @@ warnIncomplete() if have_pvplugin_support then ( - wmakeLibPv foamPv + wmakeLibPv common wmakeLibPv blockMeshReader/library wmakeLibPv foamReader/library diff --git a/src/paraview-plugins/blockMeshReader/CMakeLists-Project.txt b/src/paraview-plugins/blockMeshReader/CMakeLists-Project.txt index f8b8e457d82957c9b6587f6c656302a615687f81..cc78eacf8ba91a2b197a39afbbcd7647dcf48d60 100644 --- a/src/paraview-plugins/blockMeshReader/CMakeLists-Project.txt +++ b/src/paraview-plugins/blockMeshReader/CMakeLists-Project.txt @@ -1,6 +1,8 @@ #----------------------------------------------------------------------------- # OpenFOAM blockMeshDict reader plugin for ParaView GUI (pre-5.7) +set(CMAKE_BUILD_TYPE Release) + link_directories( $ENV{FOAM_LIBBIN} ) @@ -10,7 +12,7 @@ include_directories( ${LIB_SRC}/OpenFOAM/lnInclude ${LIB_SRC}/OSspecific/${WM_OSTYPE}/lnInclude ${LIB_SRC}/meshing/blockMesh/lnInclude - ${PROJECT_SOURCE_DIR}/../foamPv + ${PROJECT_SOURCE_DIR}/../common ${PROJECT_SOURCE_DIR}/library ${PROJECT_SOURCE_DIR}/plugin ${PROJECT_SOURCE_DIR}/plugin/reader @@ -37,7 +39,7 @@ add_paraview_property_group_widget(IFACES0 IFACES0_SRCS ) add_paraview_plugin( - PVblockMeshReader_SM "1.0" + PVblockMeshReader_SM "${foam_api}" SERVER_MANAGER_XML plugin/PVblockMeshReader_SM.xml SERVER_MANAGER_SOURCES @@ -53,7 +55,7 @@ add_paraview_plugin( target_link_libraries( PVblockMeshReader_SM LINK_PUBLIC - foamPv${foamPvLibQualifier} + vtkPVFoamCommon${foamPvLibQualifier} vtkPVblockMesh${foamPvLibQualifier} ${OPENFOAM_LIBNAMES} ) diff --git a/src/paraview-plugins/blockMeshReader/CMakeLists.txt b/src/paraview-plugins/blockMeshReader/CMakeLists.txt index 9062310502c4f85170612ca2704499eff3d1e35e..1259ea12599d2889c01bade2d6dcfd16e42478cd 100644 --- a/src/paraview-plugins/blockMeshReader/CMakeLists.txt +++ b/src/paraview-plugins/blockMeshReader/CMakeLists.txt @@ -1,7 +1,7 @@ #----------------------------------------------------------------------------- - cmake_minimum_required(VERSION 2.8) -cmake_policy(SET CMP0002 NEW) # Policy CMP0002 required for for cmake >= 3 +cmake_policy(SET CMP0002 NEW) # For cmake >= 3 +cmake_policy(SET CMP0057 NEW) # For cmake >= 3.10.2 # Fail if not building out-of-source if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) @@ -32,16 +32,29 @@ else() endif() endif() +# Pass through the OpenFOAM API value to the reader +set(foam_api "$ENV{FOAM_API}") +if (NOT "${foam_api}") + set(foam_api "2.0") +endif() + set(foamPvLibQualifier "-pv${pv_api}") -message("OpenFOAM libraries qualified with ${foamPvLibQualifier}") + +#----------------------------------------------------------------------------- + +message("================") +message("Using ParaView = $ENV{ParaView_DIR}") +message("OpenFOAM api = ${foam_api}, libs = ${foamPvLibQualifier}") #----------------------------------------------------------------------------- include(CMakeLists-OpenFOAM.txt) if (${ParaView_VERSION} GREATER_EQUAL 5.7) + message("================") include(CMakeLists-Project57.txt) else() + message("================") include(${PARAVIEW_USE_FILE}) include(CMakeLists-Project.txt) endif() diff --git a/src/paraview-plugins/blockMeshReader/library/Make/options b/src/paraview-plugins/blockMeshReader/library/Make/options index f6b311335eab35a6f48a0d43512a87a92a22ac43..a3bafe7090e5eff76b25051aa524f426e34d4777 100644 --- a/src/paraview-plugins/blockMeshReader/library/Make/options +++ b/src/paraview-plugins/blockMeshReader/library/Make/options @@ -6,11 +6,11 @@ EXE_INC = \ -I$(LIB_SRC)/mesh/blockMesh/lnInclude \ -I$(PARAVIEW_INC_DIR) \ -I$(PARAVIEW_INC_DIR)/vtkkwiml \ - -I../../foamPv \ + -I../../common \ -I../plugin/reader LIB_LIBS = \ -lmeshTools \ -lblockMesh \ - -L$(FOAM_LIBBIN) -lfoamPv-pv${PARAVIEW_API} \ + -L$(FOAM_LIBBIN) -lvtkPVFoamCommon-pv${PARAVIEW_API} \ $(GLIBS) diff --git a/src/paraview-plugins/common/Make/files b/src/paraview-plugins/common/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..8710846366da4900643018460c041bb7682e68b2 --- /dev/null +++ b/src/paraview-plugins/common/Make/files @@ -0,0 +1,3 @@ +foamPvCore.C + +LIB = $(FOAM_LIBBIN)/libvtkPVFoamCommon-pv${PARAVIEW_API} diff --git a/src/paraview-plugins/foamPv/Make/options b/src/paraview-plugins/common/Make/options similarity index 100% rename from src/paraview-plugins/foamPv/Make/options rename to src/paraview-plugins/common/Make/options diff --git a/src/paraview-plugins/foamPv/foamPvCore.C b/src/paraview-plugins/common/foamPvCore.C similarity index 100% rename from src/paraview-plugins/foamPv/foamPvCore.C rename to src/paraview-plugins/common/foamPvCore.C diff --git a/src/paraview-plugins/foamPv/foamPvCore.H b/src/paraview-plugins/common/foamPvCore.H similarity index 100% rename from src/paraview-plugins/foamPv/foamPvCore.H rename to src/paraview-plugins/common/foamPvCore.H diff --git a/src/paraview-plugins/foamPv/foamPvCoreTemplates.C b/src/paraview-plugins/common/foamPvCoreTemplates.C similarity index 100% rename from src/paraview-plugins/foamPv/foamPvCoreTemplates.C rename to src/paraview-plugins/common/foamPvCoreTemplates.C diff --git a/src/paraview-plugins/foamPv/Make/files b/src/paraview-plugins/foamPv/Make/files deleted file mode 100644 index f3fb1b8d071fe03b82b3900fc9a4b6dbbadf8ef8..0000000000000000000000000000000000000000 --- a/src/paraview-plugins/foamPv/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -foamPvCore.C - -LIB = $(FOAM_LIBBIN)/libfoamPv-pv${PARAVIEW_API} diff --git a/src/paraview-plugins/foamReader/CMakeLists-Project.txt b/src/paraview-plugins/foamReader/CMakeLists-Project.txt index c3bf5d129f265cff679cc184c49f438696c55679..8d08198eec190ce03ae71490a0946e0e46769fd7 100644 --- a/src/paraview-plugins/foamReader/CMakeLists-Project.txt +++ b/src/paraview-plugins/foamReader/CMakeLists-Project.txt @@ -1,6 +1,8 @@ #----------------------------------------------------------------------------- # OpenFOAM reader plugin for ParaView GUI (pre-5.7) +set(CMAKE_BUILD_TYPE Release) + link_directories( $ENV{FOAM_LIBBIN} ) @@ -13,7 +15,7 @@ include_directories( ${LIB_SRC}/conversion/lnInclude ${LIB_SRC}/finiteArea/lnInclude ${LIB_SRC}/finiteVolume/lnInclude - ${PROJECT_SOURCE_DIR}/../foamPv + ${PROJECT_SOURCE_DIR}/../common ${PROJECT_SOURCE_DIR}/library ${PROJECT_SOURCE_DIR}/plugin ${PROJECT_SOURCE_DIR}/plugin/reader @@ -43,7 +45,7 @@ add_paraview_property_group_widget(IFACES0 IFACES0_SRCS ) add_paraview_plugin( - PVFoamReader_SM "1.0" + PVFoamReader_SM "${foam_api}" SERVER_MANAGER_XML plugin/PVFoamReader_SM.xml SERVER_MANAGER_SOURCES @@ -56,11 +58,10 @@ add_paraview_plugin( plugin/pqFoamReaderControls.cxx ) - target_link_libraries( PVFoamReader_SM LINK_PUBLIC - foamPv${foamPvLibQualifier} + vtkPVFoamCommon${foamPvLibQualifier} vtkPVFoam${foamPvLibQualifier} ${OPENFOAM_LIBNAMES} ) diff --git a/src/paraview-plugins/foamReader/CMakeLists.txt b/src/paraview-plugins/foamReader/CMakeLists.txt index 9062310502c4f85170612ca2704499eff3d1e35e..e434f07c318ba42bd445df88af509761ad2e57fa 100644 --- a/src/paraview-plugins/foamReader/CMakeLists.txt +++ b/src/paraview-plugins/foamReader/CMakeLists.txt @@ -1,7 +1,7 @@ #----------------------------------------------------------------------------- - cmake_minimum_required(VERSION 2.8) -cmake_policy(SET CMP0002 NEW) # Policy CMP0002 required for for cmake >= 3 +cmake_policy(SET CMP0002 NEW) # For cmake >= 3 +cmake_policy(SET CMP0057 NEW) # For cmake >= 3.10.2 # Fail if not building out-of-source if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) @@ -32,16 +32,27 @@ else() endif() endif() +# Pass through the OpenFOAM API value to the reader +set(foam_api "$ENV{FOAM_API}") +if (NOT "${foam_api}") + set(foam_api "2.0") +endif() + set(foamPvLibQualifier "-pv${pv_api}") -message("OpenFOAM libraries qualified with ${foamPvLibQualifier}") #----------------------------------------------------------------------------- +message("================") +message("Using ParaView = $ENV{ParaView_DIR}") +message("OpenFOAM api = ${foam_api}, libs = ${foamPvLibQualifier}") + include(CMakeLists-OpenFOAM.txt) if (${ParaView_VERSION} GREATER_EQUAL 5.7) + message("================") include(CMakeLists-Project57.txt) else() + message("================") include(${PARAVIEW_USE_FILE}) include(CMakeLists-Project.txt) endif() diff --git a/src/paraview-plugins/foamReader/library/Make/options b/src/paraview-plugins/foamReader/library/Make/options index 7315fd9d1f202b4c06784ee1c49f59528dd1c582..0e6f37d86429b49b74de768d690a323e0919e687 100644 --- a/src/paraview-plugins/foamReader/library/Make/options +++ b/src/paraview-plugins/foamReader/library/Make/options @@ -9,7 +9,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(PARAVIEW_INC_DIR) \ -I$(PARAVIEW_INC_DIR)/vtkkwiml \ - -I../../foamPv \ + -I../../common \ -I../plugin/reader LIB_LIBS = \ @@ -21,5 +21,5 @@ LIB_LIBS = \ -ldynamicMesh \ -lgenericPatchFields \ -llagrangian \ - -L$(FOAM_LIBBIN) -lfoamPv-pv${PARAVIEW_API} \ + -L$(FOAM_LIBBIN) -lvtkPVFoamCommon-pv${PARAVIEW_API} \ $(GLIBS)