Commit 660d8013 authored by Robert Maynard's avatar Robert Maynard

Plugin now properly links to the Algorithms

parent 4e408ab7
......@@ -11,6 +11,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/vtkAvtAlgorithmsExport.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/vtkAvtAlgorithmsExport.h")
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${AVT_DATABASE_SOURCE_DIR}/Database
${AVT_DATABASE_SOURCE_DIR}/Formats
......@@ -26,9 +27,8 @@ ${AVT_PIPELINE_SOURCE_DIR}/Sinks
${AVT_PIPELINE_SOURCE_DIR}/Sources
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS})
ADD_LIBRARY(AVTAlgorithms ${SOURCES})
TARGET_LINK_LIBRARIES(AVTAlgorithms visitcommon avtdatabase_ser avtpipeline_ser)
ADD_PARAVIEW_PLUGIN(AVTAlgorithms "1.0"
SERVER_MANAGER_SOURCES ${SOURCES}
)
TARGET_LINK_LIBRARIES(AVTAlgorithms visitcommon avtdatabase_ser avtpipeline_ser visit_vtk)
......@@ -16,6 +16,9 @@ FluentPluginInfo.C
)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${AVTALGORITHMS_BINARY_DIR}
${AVTALGORITHMS_SOURCE_DIR}
${AVT_DATABASE_SOURCE_DIR}/Database
${AVT_DATABASE_SOURCE_DIR}/Formats
......@@ -32,12 +35,10 @@ ${AVT_PIPELINE_SOURCE_DIR}/Sources
${VTK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${VTK_LIBRARY_DIRS})
ADD_PARAVIEW_PLUGIN(VisItFluentReader "1.0"
SERVER_MANAGER_SOURCES ${SERVER_SOURCES}
SERVER_SOURCES ${EXTRA_SOURCES}
SERVER_MANAGER_XML VisItFluentReaderSM.xml
GUI_RESOURCE_FILES VisItFluentReaderGUI.xml)
TARGET_LINK_LIBRARIES(VisItFluentReader AVTAlgorithms visitcommon avtdatabase_ser avtpipeline_ser)
TARGET_LINK_LIBRARIES(VisItFluentReader AVTAlgorithms)
......@@ -30,15 +30,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
========================================================================*/
#ifndef _vtkVisItReader_h
#define _vtkVisItReader_h
#include "vtkSTMDAvtFileFormatAlgorithm.h"
#ifndef _vtkVisItFluentReader_h
#define _vtkVisItFluentReader_h
class VTK_EXPORT vtkVisItFluentReader : public vtkSTMDAvtFileFormatAlgorithm
#include "vtkAvtSTMDFileFormatAlgorithm.h"
class vtkVisItFluentReader : public vtkAvtSTMDFileFormatAlgorithm
{
public:
static vtkVisItFluentReader *New();
vtkTypeMacro(vtkVisItFluentReader,vtkSTMDAvtFileFormatAlgorithm );
vtkTypeMacro(vtkVisItFluentReader,vtkAvtSTMDFileFormatAlgorithm );
void PrintSelf(ostream& os, vtkIndent indent);
vtkSetStringMacro(FileName);
vtkGetStringMacro(FileName);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment