Changeset 4232

Timestamp:

Mar 11, 2014, 11:19:29 AM (11 years ago)

Author:

ldelgass

Message:

merge r3973 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• packages/vizservers/vtkvis/Makefile.in (modified) (1 diff)

branches/1.3/packages/vizservers/vtkvis/Makefile.in

@@ -42 +42 @@
 VTK_LIB_DIR     = @VTK_LIB_DIR@
 VTK_INC_SPEC    = @VTK_INC_SPEC@
+VTK_VERSION     = 6.0
 VTK_LIB_SPEC    = \
-                -lvtkDomainsChemistry-6.0 \
-                -lvtkIOCore-6.0 \
-                -lvtkIOLegacy-6.0 \
-                -lvtkFiltersExtraction-6.0 \
-                -lvtkFiltersModeling-6.0 \
-                -lvtkFiltersFlowPaths-6.0 \
-                -lvtkFiltersGeometry-6.0 \
-                -lvtkFiltersSources-6.0 \
-                -lvtkFiltersGeneral-6.0 \
-                -lvtkFiltersCore-6.0 \
-                -lvtkImagingHybrid-6.0 \
-                -lvtkImagingCore-6.0 \
-                -lvtkInteractionStyle-6.0 \
-                -lvtkInteractionWidgets-6.0 \
-                -lvtkRenderingOpenGL-6.0 \
-                -lvtkRenderingHybridOpenGL-6.0 \
-                -lvtkRenderingFreeTypeOpenGL-6.0 \
-                -lvtkRenderingFreeTypeFontConfig-6.0 \
-                -lvtkRenderingFreeType-6.0  \
-                -lvtkRenderingVolumeOpenGL-6.0 \
-                -lvtkRenderingVolume-6.0 \
-                -lvtkRenderingLabel-6.0 \
-                -lvtkRenderingAnnotation-6.0 \
-                -lvtkRenderingCore-6.0 \
-                -lvtkCommonCore-6.0 \
-                -lvtkCommonDataModel-6.0 \
-                -lvtkCommonExecutionModel-6.0  \
-                -lvtkCommonMisc-6.0  \
-                -lvtkCommonTransforms-6.0 \
-                -lvtkCommonMath-6.0 \
-                -lvtksys-6.0
+                -lvtkDomainsChemistry-$(VTK_VERSION) \
+                -lvtkIOCore-$(VTK_VERSION) \
+                -lvtkIOLegacy-$(VTK_VERSION) \
+                -lvtkFiltersExtraction-$(VTK_VERSION) \
+                -lvtkFiltersModeling-$(VTK_VERSION) \
+                -lvtkFiltersFlowPaths-$(VTK_VERSION) \
+                -lvtkFiltersGeometry-$(VTK_VERSION) \
+                -lvtkFiltersSources-$(VTK_VERSION) \
+                -lvtkFiltersGeneral-$(VTK_VERSION) \
+                -lvtkFiltersCore-$(VTK_VERSION) \
+                -lvtkImagingHybrid-$(VTK_VERSION) \
+                -lvtkImagingCore-$(VTK_VERSION) \
+                -lvtkInteractionStyle-$(VTK_VERSION) \
+                -lvtkInteractionWidgets-$(VTK_VERSION) \
+                -lvtkRenderingOpenGL-$(VTK_VERSION) \
+                -lvtkRenderingHybridOpenGL-$(VTK_VERSION) \
+                -lvtkRenderingImage-$(VTK_VERSION) \
+                -lvtkRenderingFreeTypeOpenGL-$(VTK_VERSION) \
+                -lvtkRenderingFreeTypeFontConfig-$(VTK_VERSION) \
+                -lvtkRenderingFreeType-$(VTK_VERSION)  \
+                -lvtkRenderingVolumeOpenGL-$(VTK_VERSION) \
+                -lvtkRenderingVolume-$(VTK_VERSION) \
+                -lvtkRenderingLabel-$(VTK_VERSION) \
+                -lvtkRenderingAnnotation-$(VTK_VERSION) \
+                -lvtkRenderingCore-$(VTK_VERSION) \
+                -lvtkCommonCore-$(VTK_VERSION) \
+                -lvtkCommonDataModel-$(VTK_VERSION) \
+                -lvtkCommonExecutionModel-$(VTK_VERSION)  \
+                -lvtkCommonMisc-$(VTK_VERSION)  \
+                -lvtkCommonTransforms-$(VTK_VERSION) \
+                -lvtkCommonMath-$(VTK_VERSION) \
+                -lvtksys-$(VTK_VERSION)
 
 LD_RUN_PATH     = $(libdir)