[cig-commits] r14481 - in cs/cigma/trunk: config src

[luis at geodynamics.org]

Author: luis
Date: 2009-03-27 10:09:02 -0700 (Fri, 27 Mar 2009)
New Revision: 14481

Modified:
   cs/cigma/trunk/config/cigma_vtk.m4
   cs/cigma/trunk/src/cigma.cpp
   cs/cigma/trunk/src/io_vtk.cpp
   cs/cigma/trunk/src/io_vtk.h
Log:
Will this patch fix issues with vtk-5.2?

Everything compiles fine, but the final linking fails due
to missing template instantiations. For now, just revert
to using the older vtk-5.0 version.

Modified: cs/cigma/trunk/config/cigma_vtk.m4
===================================================================
--- cs/cigma/trunk/config/cigma_vtk.m4	2009-03-27 13:08:17 UTC (rev 14480)
+++ cs/cigma/trunk/config/cigma_vtk.m4	2009-03-27 17:09:02 UTC (rev 14481)
@@ -130,7 +130,7 @@
                     ], [$VTK_SUPPORT_LIBS])
                 ], [$VTK_SUPPORT_LIBS])
             ], [$VTK_SUPPORT_LIBS])
-            VTK_LIBS="-lvtkIO -lvtkDICOMParser -lvtkFiltering -lvtkCommon $VTK_SUPPORT_LIBS -lvtksys"
+            VTK_LIBS="-lvtkIO -lvtkDICOMParser -lvtkFiltering -lvtkGenericFiltering -lvtkCommon $VTK_SUPPORT_LIBS -lvtksys"
             LIBS="$VTK_LIBS $LIBS"
 
             dnl now, check that we don't exceed the specified version

Modified: cs/cigma/trunk/src/cigma.cpp
===================================================================
--- cs/cigma/trunk/src/cigma.cpp	2009-03-27 13:08:17 UTC (rev 14480)
+++ cs/cigma/trunk/src/cigma.cpp	2009-03-27 17:09:02 UTC (rev 14481)
@@ -1,5 +1,7 @@
 #include "cli_application.h"
 
+#include "io_vtk.h"
+
 int main(int argc, char *argv[])
 {
     cigma::Application app;

Modified: cs/cigma/trunk/src/io_vtk.cpp
===================================================================
--- cs/cigma/trunk/src/io_vtk.cpp	2009-03-27 13:08:17 UTC (rev 14480)
+++ cs/cigma/trunk/src/io_vtk.cpp	2009-03-27 17:09:02 UTC (rev 14481)
@@ -237,6 +237,13 @@
     return xmlReader;
 }
 
+// explicit instantiations of vtkDataArrayTemplate
+//*
+template class vtkDataArrayTemplate<int>;
+template class vtkDataArrayTemplate<long>;
+template class vtkDataArrayTemplate<float>;
+template class vtkDataArrayTemplate<double>;
+// */
 
 
 #endif /* HAVE_VTK */

Modified: cs/cigma/trunk/src/io_vtk.h
===================================================================
--- cs/cigma/trunk/src/io_vtk.h	2009-03-27 13:08:17 UTC (rev 14480)
+++ cs/cigma/trunk/src/io_vtk.h	2009-03-27 17:09:02 UTC (rev 14481)
@@ -60,7 +60,9 @@
 
 #include "vtkType.h"
 
+#include "vtkDataArrayTemplate.h"
 
+
 template <typename T>
 int vtk_datatype_from()
 {