From f0fc2a2671084e60aed5ce281fbbfe5724503163 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 10 Dec 2018 16:43:32 +0100
Subject: [PATCH] BUG: paraview target was tagged with ParaVIEW_MAJOR instead
of PARAVIEW_API
- regression was introduced by 628b2445fc1e
---
.../postProcessing/graphics/PVReaders/foamPv/Make/files | 2 +-
.../postProcessing/graphics/PVReaders/vtkPVFoam/Make/files | 2 +-
.../postProcessing/graphics/PVReaders/vtkPVFoam/Make/options | 2 +-
.../postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/files | 2 +-
.../graphics/PVReaders/vtkPVblockMesh/Make/options | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/Make/files b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/Make/files
index 6bace7560c4..f3fb1b8d071 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/foamPv/Make/files
+++ b/applications/utilities/postProcessing/graphics/PVReaders/foamPv/Make/files
@@ -1,3 +1,3 @@
foamPvCore.C
-LIB = $(FOAM_LIBBIN)/libfoamPv-pv${ParaView_MAJOR}
+LIB = $(FOAM_LIBBIN)/libfoamPv-pv${PARAVIEW_API}
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/files b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/files
index c159826919e..079991864ad 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/files
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/files
@@ -5,4 +5,4 @@ vtkPVFoamMeshLagrangian.C
vtkPVFoamMeshVolume.C
vtkPVFoamUpdateInfo.C
-LIB = $(FOAM_LIBBIN)/libvtkPVFoam-pv${ParaView_MAJOR}
+LIB = $(FOAM_LIBBIN)/libvtkPVFoam-pv${PARAVIEW_API}
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/options
index 69d9b12aa09..db95069c804 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/Make/options
@@ -18,5 +18,5 @@ LIB_LIBS = \
-lconversion \
-lgenericPatchFields \
-llagrangian \
- -L$(FOAM_LIBBIN) -lfoamPv-pv$(PARAVIEW_API) \
+ -L$(FOAM_LIBBIN) -lfoamPv-pv${PARAVIEW_API} \
$(GLIBS)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/files b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/files
index 35930f249c8..12405a2ef23 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/files
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/files
@@ -1,4 +1,4 @@
vtkPVblockMesh.C
vtkPVblockMeshConvert.C
-LIB = $(FOAM_LIBBIN)/libvtkPVblockMesh-pv${ParaView_MAJOR}
+LIB = $(FOAM_LIBBIN)/libvtkPVblockMesh-pv${PARAVIEW_API}
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/options
index 9ecf4c42764..40f9fce989b 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/options
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVblockMesh/Make/options
@@ -12,5 +12,5 @@ EXE_INC = \
LIB_LIBS = \
-lmeshTools \
-lblockMesh \
- -L$(FOAM_LIBBIN) -lfoamPv-pv$(PARAVIEW_API) \
+ -L$(FOAM_LIBBIN) -lfoamPv-pv${PARAVIEW_API} \
$(GLIBS)
--
GitLab