Browse files

Fix (hopefully) for compiling against older VTK

Disable compression on VTK library versions that don't support that
API
  • Loading branch information...
1 parent 3169b0e commit 482fe46f807413f22c1afdf2231e6ed3034aaf8c @roystgnr roystgnr committed Jan 25, 2013
Showing with 269 additions and 0 deletions.
  1. +3 −0 Makefile.in
  2. +31 −0 configure
  3. +3 −0 contrib/Makefile.in
  4. +3 −0 contrib/boost/include/Makefile.in
  5. +3 −0 contrib/exodusii/Lib/Makefile.in
  6. +3 −0 contrib/fparser/Makefile.in
  7. +3 −0 contrib/fparser/extrasrc/Makefile.in
  8. +3 −0 contrib/gmv/Makefile.in
  9. +3 −0 contrib/gzstream/Makefile.in
  10. +3 −0 contrib/laspack/Makefile.in
  11. +3 −0 contrib/libHilbert/Makefile.in
  12. +3 −0 contrib/metis/Makefile.in
  13. +3 −0 contrib/nanoflann/Makefile.in
  14. +3 −0 contrib/nemesis/Lib/Makefile.in
  15. +3 −0 contrib/netcdf/Lib/Makefile.in
  16. +3 −0 contrib/parmetis/Makefile.in
  17. +3 −0 contrib/sfcurves/Makefile.in
  18. +3 −0 contrib/tecplot/tecio/Makefile.in
  19. +3 −0 contrib/tetgen/Makefile.in
  20. +3 −0 contrib/triangle/Makefile.in
  21. +3 −0 examples/Makefile.in
  22. +3 −0 examples/adaptivity/adaptivity_ex1/Makefile.in
  23. +3 −0 examples/adaptivity/adaptivity_ex2/Makefile.in
  24. +3 −0 examples/adaptivity/adaptivity_ex3/Makefile.in
  25. +3 −0 examples/adaptivity/adaptivity_ex4/Makefile.in
  26. +3 −0 examples/adaptivity/adaptivity_ex5/Makefile.in
  27. +3 −0 examples/adjoints/adjoints_ex1/Makefile.in
  28. +3 −0 examples/adjoints/adjoints_ex2/Makefile.in
  29. +3 −0 examples/adjoints/adjoints_ex3/Makefile.in
  30. +3 −0 examples/adjoints/adjoints_ex4/Makefile.in
  31. +3 −0 examples/eigenproblems/eigenproblems_ex1/Makefile.in
  32. +3 −0 examples/eigenproblems/eigenproblems_ex2/Makefile.in
  33. +3 −0 examples/eigenproblems/eigenproblems_ex3/Makefile.in
  34. +3 −0 examples/fem_system/fem_system_ex1/Makefile.in
  35. +3 −0 examples/fem_system/fem_system_ex2/Makefile.in
  36. +3 −0 examples/introduction/introduction_ex1/Makefile.in
  37. +3 −0 examples/introduction/introduction_ex2/Makefile.in
  38. +3 −0 examples/introduction/introduction_ex3/Makefile.in
  39. +3 −0 examples/introduction/introduction_ex4/Makefile.in
  40. +3 −0 examples/introduction/introduction_ex5/Makefile.in
  41. +3 −0 examples/miscellaneous/miscellaneous_ex1/Makefile.in
  42. +3 −0 examples/miscellaneous/miscellaneous_ex2/Makefile.in
  43. +3 −0 examples/miscellaneous/miscellaneous_ex3/Makefile.in
  44. +3 −0 examples/miscellaneous/miscellaneous_ex4/Makefile.in
  45. +3 −0 examples/miscellaneous/miscellaneous_ex5/Makefile.in
  46. +3 −0 examples/miscellaneous/miscellaneous_ex6/Makefile.in
  47. +3 −0 examples/miscellaneous/miscellaneous_ex7/Makefile.in
  48. +3 −0 examples/miscellaneous/miscellaneous_ex8/Makefile.in
  49. +3 −0 examples/reduced_basis/reduced_basis_ex1/Makefile.in
  50. +3 −0 examples/reduced_basis/reduced_basis_ex2/Makefile.in
  51. +3 −0 examples/reduced_basis/reduced_basis_ex3/Makefile.in
  52. +3 −0 examples/reduced_basis/reduced_basis_ex4/Makefile.in
  53. +3 −0 examples/reduced_basis/reduced_basis_ex5/Makefile.in
  54. +3 −0 examples/reduced_basis/reduced_basis_ex6/Makefile.in
  55. +3 −0 examples/reduced_basis/reduced_basis_ex7/Makefile.in
  56. +3 −0 examples/subdomains/subdomains_ex1/Makefile.in
  57. +3 −0 examples/subdomains/subdomains_ex2/Makefile.in
  58. +3 −0 examples/systems_of_equations/systems_of_equations_ex1/Makefile.in
  59. +3 −0 examples/systems_of_equations/systems_of_equations_ex2/Makefile.in
  60. +3 −0 examples/systems_of_equations/systems_of_equations_ex3/Makefile.in
  61. +3 −0 examples/systems_of_equations/systems_of_equations_ex4/Makefile.in
  62. +3 −0 examples/systems_of_equations/systems_of_equations_ex5/Makefile.in
  63. +3 −0 examples/systems_of_equations/systems_of_equations_ex6/Makefile.in
  64. +3 −0 examples/transient/transient_ex1/Makefile.in
  65. +3 −0 examples/transient/transient_ex2/Makefile.in
  66. +3 −0 examples/vector_fe/vector_fe_ex1/Makefile.in
  67. +3 −0 examples/vector_fe/vector_fe_ex2/Makefile.in
  68. +3 −0 examples/vector_fe/vector_fe_ex3/Makefile.in
  69. +3 −0 include/Makefile.in
  70. +3 −0 include/libmesh/Makefile.in
  71. +9 −0 include/libmesh_config.h.in
  72. +3 −0 m4/config_summary.m4
  73. +16 −0 m4/vtk.m4
  74. +3 −0 tests/Makefile.in
View
3 Makefile.in
@@ -4074,6 +4074,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
# # Additional files to be deleted by 'make maintainer-clean'
# MAINTAINERCLEANFILES = \
View
31 configure
@@ -696,6 +696,9 @@ EIGEN_INCLUDE
LIBMESH_ENABLE_VTK_FALSE
LIBMESH_ENABLE_VTK_TRUE
VTK_LIBRARY
+vtkbuild
+vtkmajor
+vtkversion
VTK_DIR
VTK_INCLUDE
LIBMESH_ENABLE_GMV_FALSE
@@ -30955,6 +30958,31 @@ $as_echo "VTK header files not found!" >&6; }
vtkminor=`grep "define VTK_MINOR_VERSION" $VTK_INC/vtkConfigure.h | sed -e "s/#define VTK_MINOR_VERSION[ ]*//g"`
vtkbuild=`grep "define VTK_BUILD_VERSION" $VTK_INC/vtkConfigure.h | sed -e "s/#define VTK_BUILD_VERSION[ ]*//g"`
vtkversion=$vtkmajor.$vtkminor.$vtkbuild
+
+ vtkmajorminor=$vtkmajor.$vtkminor.x
+
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define DETECTED_VTK_VERSION_MAJOR $vtkmajor
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define DETECTED_VTK_VERSION_MINOR $vtkminor
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define DETECTED_VTK_VERSION_SUBMINOR $vtkbuild
+_ACEOF
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with VTK version $vtkversion support >>>" >&5
$as_echo "<<< Configuring library with VTK version $vtkversion support >>>" >&6; }
fi
@@ -35877,6 +35905,9 @@ if (test "x$enableoptional" = "xyes"); then
echo ' 'ML............................ : $enableml
fi
echo ' 'vtk.............................. : $enablevtk
+ if (test "x$enablevtk" = "xyes"); then
+ echo ' 'version....................... : $vtkversion
+ fi
echo
if (test "x$libmesh_optional_INCLUDES" != "x"); then
echo ' 'libmesh_optional_INCLUDES........ : $libmesh_optional_INCLUDES
View
3 contrib/Makefile.in
@@ -636,6 +636,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
AUTOMAKE_OPTIONS = subdir-objects
###########################################################
View
3 contrib/boost/include/Makefile.in
@@ -670,6 +670,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
# These are the headers we actually want to install and make available
@LIBMESH_INSTALL_INTERNAL_BOOST_TRUE@nobase_include_HEADERS = \
View
3 contrib/exodusii/Lib/Makefile.in
@@ -1162,6 +1162,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
include_HEADERS = include/exodusII.h include/exodusII_ext.h
pkg_cppflags = -I$(srcdir)/include -I$(top_srcdir)/contrib/netcdf/Lib
pkg_sources = \
View
3 contrib/fparser/Makefile.in
@@ -611,6 +611,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = $(CPPFLAGS_OPT) -I$(srcdir)/fpoptimizer
AM_CFLAGS = $(CFLAGS_OPT)
View
3 contrib/fparser/extrasrc/Makefile.in
@@ -384,6 +384,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
EXTRA_DIST = fp_opcode_add.inc.release
@FPARSER_RELEASE_TRUE@BUILT_SOURCES = fp_opcode_add.inc
@FPARSER_RELEASE_TRUE@CLEANFILES = $(BUILT_SOURCES)
View
3 contrib/gmv/Makefile.in
@@ -466,6 +466,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
pkg_sources = gmvread.c gmvread.h
######################################################################
View
3 contrib/gzstream/Makefile.in
@@ -488,6 +488,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
pkg_sources = gzstream.C gzstream.h
pkg_libs = -lz
View
3 contrib/laspack/Makefile.in
@@ -526,6 +526,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
pkg_cppflags = -I$(top_builddir)/include #for #include "libmesh/libmesh_config.h"
pkg_sources = \
copyrght.h \
View
3 contrib/libHilbert/Makefile.in
@@ -529,6 +529,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
pkg_cppflags = -I$(srcdir)/include
pkg_sources = \
src/BigBitVec.C \
View
3 contrib/metis/Makefile.in
@@ -727,6 +727,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
pkg_cppflags = -DLIBMESH_IS_COMPILING_METIS -I$(srcdir)/include \
-I$(srcdir)/GKlib -I$(srcdir)/Lib -I$(top_builddir)/include \
#for #include "libmesh/libmesh_config.h"
View
3 contrib/nanoflann/Makefile.in
@@ -500,6 +500,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = -I$(srcdir)/include $(am__append_1)
AM_CFLAGS =
View
3 contrib/nemesis/Lib/Makefile.in
@@ -626,6 +626,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
pkg_cppflags = -I$(top_srcdir)/contrib/exodusii/Lib/include \
-I$(top_srcdir)/contrib/netcdf/Lib
View
3 contrib/netcdf/Lib/Makefile.in
@@ -535,6 +535,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
include_HEADERS = netcdf.h
pkg_sources = attr.c ncx.c putget.c dim.c error.c libvers.c nc.c string.c v1hpg.c var.c posixio.c v2i.c \
config.h fbits.h nc3convert.h nc.h ncio.h ncx.h netcdf3.h netcdf.h onstack.h rnd.h
View
3 contrib/parmetis/Makefile.in
@@ -617,6 +617,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
# include paths - note that parmetis needs metis!
pkg_cppflags = -DLIBMESH_IS_COMPILING_PARMETIS \
View
3 contrib/sfcurves/Makefile.in
@@ -476,6 +476,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
pkg_sources = sfcurves.h sfcurves_internal.h cmp.c hilbert.c morton.c
######################################################################
View
3 contrib/tecplot/tecio/Makefile.in
@@ -610,6 +610,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
pkg_cppflags = @TECIO_CPPFLAGS@ -DUSEENUM -DTHREED -DMAKEARCHIVE -DNO_ASSERTS
pkg_sources = \
include/TECIO.h \
View
3 contrib/tetgen/Makefile.in
@@ -500,6 +500,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
include_HEADERS = tetgen.h
pkg_sources = tetgen.C predicates.C
pkg_cppflags = -DTETLIBRARY -DLIBMESH_IS_COMPILING_TETGEN
View
3 contrib/triangle/Makefile.in
@@ -500,6 +500,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
include_HEADERS = triangle.h
pkg_sources = triangle.c
pkg_cppflags = -DTRILIBRARY -DANSI_DECLARATORS \
View
3 examples/Makefile.in
@@ -452,6 +452,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
SUBDIRS = \
introduction/introduction_ex1 \
introduction/introduction_ex2 \
View
3 examples/adaptivity/adaptivity_ex1/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = adaptivity_ex1
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/adaptivity/ex1
View
3 examples/adaptivity/adaptivity_ex2/Makefile.in
@@ -545,6 +545,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
BUILT_SOURCES = exact_solution.C $(am__append_1)
DISTCLEANFILES = $(BUILT_SOURCES)
example_name = adaptivity_ex2
View
3 examples/adaptivity/adaptivity_ex3/Makefile.in
@@ -537,6 +537,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = adaptivity_ex3
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/adaptivity/ex3
View
3 examples/adaptivity/adaptivity_ex4/Makefile.in
@@ -536,6 +536,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = adaptivity_ex4
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/adaptivity/ex4
View
3 examples/adaptivity/adaptivity_ex5/Makefile.in
@@ -541,6 +541,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
BUILT_SOURCES = exact_solution.C
DISTCLEANFILES = $(BUILT_SOURCES)
example_name = adaptivity_ex5
View
3 examples/adjoints/adjoints_ex1/Makefile.in
@@ -595,6 +595,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = adjoints_ex1
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/adjoints/ex1
View
3 examples/adjoints/adjoints_ex2/Makefile.in
@@ -583,6 +583,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
# need to link lshaped.xda
BUILT_SOURCES = lshaped.xda $(am__append_1)
View
3 examples/adjoints/adjoints_ex3/Makefile.in
@@ -595,6 +595,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = adjoints_ex3
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/adjoints/ex3
View
3 examples/adjoints/adjoints_ex4/Makefile.in
@@ -595,6 +595,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = adjoints_ex4
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/adjoints/ex4
View
3 examples/eigenproblems/eigenproblems_ex1/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = eigenproblems_ex1
install_dir = $(examples_install_path)/eigenproblems/ex1
data = eigenproblems_ex1.C
View
3 examples/eigenproblems/eigenproblems_ex2/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = eigenproblems_ex2
install_dir = $(examples_install_path)/eigenproblems/ex2
data = eigenproblems_ex2.C run.sh
View
3 examples/eigenproblems/eigenproblems_ex3/Makefile.in
@@ -537,6 +537,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = eigenproblems_ex3
install_dir = $(examples_install_path)/eigenproblems/ex3
data = eigenproblems_ex3.C drum1_mesh.e drum2_mesh.e run.sh
View
3 examples/fem_system/fem_system_ex1/Makefile.in
@@ -560,6 +560,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = fem_system_ex1
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/fem_system/ex1
View
3 examples/fem_system/fem_system_ex2/Makefile.in
@@ -570,6 +570,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = fem_system_ex2
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/fem_system/ex2
View
3 examples/introduction/introduction_ex1/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = introduction_ex1
install_dir = $(examples_install_path)/introduction/ex1
data = introduction_ex1.C run.sh
View
3 examples/introduction/introduction_ex2/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = introduction_ex2
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/introduction/ex2
View
3 examples/introduction/introduction_ex3/Makefile.in
@@ -541,6 +541,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = introduction_ex3
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/introduction/ex3
View
3 examples/introduction/introduction_ex4/Makefile.in
@@ -541,6 +541,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
BUILT_SOURCES = exact_solution.C
DISTCLEANFILES = $(BUILT_SOURCES)
example_name = introduction_ex4
View
3 examples/introduction/introduction_ex5/Makefile.in
@@ -541,6 +541,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
BUILT_SOURCES = exact_solution.C
DISTCLEANFILES = $(BUILT_SOURCES)
example_name = introduction_ex5
View
3 examples/miscellaneous/miscellaneous_ex1/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = miscellaneous_ex1
install_dir = $(examples_install_path)/miscellaneous/ex1
data = miscellaneous_ex1.C run.sh
View
3 examples/miscellaneous/miscellaneous_ex2/Makefile.in
@@ -536,6 +536,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
######################################################################
#
View
3 examples/miscellaneous/miscellaneous_ex3/Makefile.in
@@ -536,6 +536,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
# need to link lshaped.xda
BUILT_SOURCES = lshaped.xda
View
3 examples/miscellaneous/miscellaneous_ex4/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = miscellaneous_ex4
install_dir = $(examples_install_path)/miscellaneous/ex4
data = miscellaneous_ex4.C run.sh
View
3 examples/miscellaneous/miscellaneous_ex5/Makefile.in
@@ -545,6 +545,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
# need to link lshaped.xda
BUILT_SOURCES = lshaped.xda $(am__append_1)
View
3 examples/miscellaneous/miscellaneous_ex6/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = miscellaneous_ex6
install_dir = $(examples_install_path)/miscellaneous/ex6
data = miscellaneous_ex6.C run.sh
View
3 examples/miscellaneous/miscellaneous_ex7/Makefile.in
@@ -564,6 +564,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = miscellaneous_ex7
install_dir = $(examples_install_path)/miscellaneous/ex7
data = biharmonic.C biharmonic.h biharmonic_jr.C biharmonic_jr.h miscellaneous_ex7.C run.sh
View
3 examples/miscellaneous/miscellaneous_ex8/Makefile.in
@@ -560,6 +560,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = miscellaneous_ex8
install_dir = $(examples_install_path)/miscellaneous/ex8
data = miscellaneous_ex8.C meshless_interpolation_function.h run.sh unstruct.ucd.gz struct.ucd.gz
View
3 examples/reduced_basis/reduced_basis_ex1/Makefile.in
@@ -555,6 +555,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = reduced_basis_ex1
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/reduced_basis/ex1
View
3 examples/reduced_basis/reduced_basis_ex2/Makefile.in
@@ -555,6 +555,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = reduced_basis_ex2
install_dir = $(examples_install_path)/reduced_basis/ex2
data = reduced_basis_ex2.C assembly.h rb_classes.h reduced_basis_ex2.in run.sh
View
3 examples/reduced_basis/reduced_basis_ex3/Makefile.in
@@ -555,6 +555,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = reduced_basis_ex3
install_dir = $(examples_install_path)/reduced_basis/ex3
data = reduced_basis_ex3.C assembly.h rb_classes.h reduced_basis_ex3.in run.sh
View
3 examples/reduced_basis/reduced_basis_ex4/Makefile.in
@@ -560,6 +560,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = reduced_basis_ex4
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/reduced_basis/ex4
View
3 examples/reduced_basis/reduced_basis_ex5/Makefile.in
@@ -560,6 +560,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = reduced_basis_ex5
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/reduced_basis/ex5
View
3 examples/reduced_basis/reduced_basis_ex6/Makefile.in
@@ -560,6 +560,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = reduced_basis_ex6
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/reduced_basis/ex6
View
3 examples/reduced_basis/reduced_basis_ex7/Makefile.in
@@ -555,6 +555,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = reduced_basis_ex7
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/reduced_basis/ex7
View
3 examples/subdomains/subdomains_ex1/Makefile.in
@@ -541,6 +541,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
BUILT_SOURCES = exact_solution.C
DISTCLEANFILES = $(BUILT_SOURCES)
example_name = subdomains_ex1
View
3 examples/subdomains/subdomains_ex2/Makefile.in
@@ -541,6 +541,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
BUILT_SOURCES = exact_solution.C
DISTCLEANFILES = $(BUILT_SOURCES)
example_name = subdomains_ex2
View
3 examples/systems_of_equations/systems_of_equations_ex1/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = systems_of_equations_ex1
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/systems_of_equations/ex1
View
3 examples/systems_of_equations/systems_of_equations_ex2/Makefile.in
@@ -536,6 +536,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = systems_of_equations_ex2
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/systems_of_equations/ex2
View
3 examples/systems_of_equations/systems_of_equations_ex3/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = systems_of_equations_ex3
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/systems_of_equations/ex3
View
3 examples/systems_of_equations/systems_of_equations_ex4/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = systems_of_equations_ex4
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/systems_of_equations/ex4
View
3 examples/systems_of_equations/systems_of_equations_ex5/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = systems_of_equations_ex5
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/systems_of_equations/ex5
View
3 examples/systems_of_equations/systems_of_equations_ex6/Makefile.in
@@ -531,6 +531,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = systems_of_equations_ex6
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/systems_of_equations/ex6
View
3 examples/transient/transient_ex1/Makefile.in
@@ -541,6 +541,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
BUILT_SOURCES = mesh.xda
DISTCLEANFILES = $(BUILT_SOURCES)
example_name = transient_ex1
View
3 examples/transient/transient_ex2/Makefile.in
@@ -532,6 +532,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = transient_ex2
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/transient/ex2
View
3 examples/vector_fe/vector_fe_ex1/Makefile.in
@@ -539,6 +539,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = vector_fe_ex1
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/vector_fe/ex1
View
3 examples/vector_fe/vector_fe_ex2/Makefile.in
@@ -565,6 +565,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = vector_fe_ex2
check_SCRIPTS = run.sh
install_dir = $(examples_install_path)/vector_fe/ex2
View
3 examples/vector_fe/vector_fe_ex3/Makefile.in
@@ -566,6 +566,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
example_name = vector_fe_ex3
#check_SCRIPTS = run.sh # Convergence too poor with default solvers
install_dir = $(examples_install_path)/vector_fe/ex3
View
3 include/Makefile.in
@@ -455,6 +455,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
SUBDIRS = libmesh
# special handholding for prefix_config.m4 generated files
View
3 include/libmesh/Makefile.in
@@ -390,6 +390,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
#
# include the magic script!
View
9 include/libmesh_config.h.in
@@ -73,6 +73,15 @@
/* PETSc's subminor version number, as detected by petsc.m4 */
#undef DETECTED_PETSC_VERSION_SUBMINOR
+/* VTK's major version number, as detected by vtk.m4 */
+#undef DETECTED_VTK_VERSION_MAJOR
+
+/* VTK's minor version number, as detected by vtk.m4 */
+#undef DETECTED_VTK_VERSION_MINOR
+
+/* VTK's subminor version number, as detected by vtk.m4 */
+#undef DETECTED_VTK_VERSION_SUBMINOR
+
/* Integer indicating the highest spatial dimensionality supported by libMesh
*/
#undef DIM
View
3 m4/config_summary.m4
@@ -147,6 +147,9 @@ if (test "x$enableoptional" = "xyes"); then
echo ' 'ML............................ : $enableml
fi
echo ' 'vtk.............................. : $enablevtk
+ if (test "x$enablevtk" = "xyes"); then
+ echo ' 'version....................... : $vtkversion
+ fi
echo
if (test "x$libmesh_optional_INCLUDES" != "x"); then
echo ' 'libmesh_optional_INCLUDES........ : $libmesh_optional_INCLUDES
View
16 m4/vtk.m4
@@ -92,6 +92,22 @@ AC_DEFUN([CONFIGURE_VTK],
vtkminor=`grep "define VTK_MINOR_VERSION" $VTK_INC/vtkConfigure.h | sed -e "s/#define VTK_MINOR_VERSION[ ]*//g"`
vtkbuild=`grep "define VTK_BUILD_VERSION" $VTK_INC/vtkConfigure.h | sed -e "s/#define VTK_BUILD_VERSION[ ]*//g"`
vtkversion=$vtkmajor.$vtkminor.$vtkbuild
+
+ vtkmajorminor=$vtkmajor.$vtkminor.x
+
+ AC_SUBST(vtkversion)
+ AC_SUBST(vtkmajor)
+ AC_SUBST(vtkbuild)
+
+ AC_DEFINE_UNQUOTED(DETECTED_VTK_VERSION_MAJOR, [$vtkmajor],
+ [VTK's major version number, as detected by vtk.m4])
+
+ AC_DEFINE_UNQUOTED(DETECTED_VTK_VERSION_MINOR, [$vtkminor],
+ [VTK's minor version number, as detected by vtk.m4])
+
+ AC_DEFINE_UNQUOTED(DETECTED_VTK_VERSION_SUBMINOR, [$vtkbuild],
+ [VTK's subminor version number, as detected by vtk.m4])
+
AC_MSG_RESULT(<<< Configuring library with VTK version $vtkversion support >>>)
fi
View
3 tests/Makefile.in
@@ -595,6 +595,9 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+vtkbuild = @vtkbuild@
+vtkmajor = @vtkmajor@
+vtkversion = @vtkversion@
AUTOMAKE_OPTIONS = subdir-objects
AM_CXXFLAGS = $(libmesh_CXXFLAGS)
AM_CFLAGS = $(libmesh_CFLAGS)

0 comments on commit 482fe46

Please sign in to comment.