initial support for vtk 6.x

run qmake with vtk-version given, e.g.:
qmake VTK_6_VERSION=6.1
or put this in localPaths.pri

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>

FDTD/operator.cpp

@@ -721,7 +721,11 @@ void Operator::DumpPEC2File(string filename , unsigned int *range)
 	filename += ".vtp";
 	writer->SetFileName(filename.c_str());
 
+#if VTK_MAJOR_VERSION==6
+	writer->SetInputData(polydata);
+#else
 	writer->SetInput(polydata);
+#endif
 	writer->Write();
 
 	writer->Delete();

openEMS.pro

@@ -98,25 +98,40 @@ win32 {
     DEFINES += TIXML_USE_STL
     LIBS += -lboost_thread -lboost_system
     LIBS += -lhdf5_hl -lhdf5
+
     ### vtk ###
     isEmpty(VTK_INCLUDEPATH) {
-    INCLUDEPATH += /usr/include/vtk-5.2 \
+        INCLUDEPATH += /usr/include/vtk-5.2 \
         /usr/include/vtk-5.4 \
         /usr/include/vtk-5.6 \
         /usr/include/vtk-5.8 \
         /usr/include/vtk-5.10 \
+        /usr/include/vtk-6.0 \
+        /usr/include/vtk-6.1 \
         /usr/include/vtk
     } else {
-    INCLUDEPATH += $$VTK_INCLUDEPATH
+        INCLUDEPATH += $$VTK_INCLUDEPATH
     }
     isEmpty(VTK_LIBRARYPATH){
     } else {
-    LIBS +=-L$$VTK_LIBRARYPATH
+        LIBS +=-L$$VTK_LIBRARYPATH
+        QMAKE_LFLAGS += \'-Wl,-rpath,$$VTK_LIBRARYPATH\'
     }
-    LIBS += -lvtkCommon \
+    isEmpty(VTK_6_VERSION){
+        LIBS += -lvtkCommon \
         -lvtkIO \
         -lvtksys \
         -lvtkFiltering
+    } else {
+        LIBS += -lvtkCommonCore-$$VTK_6_VERSION \
+        -lvtkCommonDataModel-$$VTK_6_VERSION \
+        -lvtkIOLegacy-$$VTK_6_VERSION \
+        -lvtkIOXML-$$VTK_6_VERSION \
+        -lvtkIOGeometry-$$VTK_6_VERSION \
+        -lvtkIOPLY-$$VTK_6_VERSION \
+        -lvtksys-$$VTK_6_VERSION \
+        -lvtkIOCore-$$VTK_6_VERSION
+    }
 }
 
 # vtk includes deprecated header files; silence the corresponding warning

tools/vtk_file_writer.cpp

@@ -285,7 +285,11 @@ bool VTK_File_Writer::WriteASCII()
 	}
 
 	writer->SetHeader(m_header.c_str());
+#if VTK_MAJOR_VERSION==6
+	writer->SetInputData(m_GridData);
+#else
 	writer->SetInput(m_GridData);
+#endif
 
 	string filename = GetTimestepFilename() + ".vtk";
 	writer->SetFileName(filename.c_str());
@@ -312,7 +316,11 @@ bool VTK_File_Writer::WriteXML()
 		return false;
 	}
 
+#if VTK_MAJOR_VERSION==6
+	writer->SetInputData(m_GridData);
+#else
 	writer->SetInput(m_GridData);
+#endif
 
 	string filename = GetTimestepFilename() + "." + writer->GetDefaultFileExtension();
 	writer->SetFileName(filename.c_str());