Commit 4e408ab7 authored by Robert Maynard's avatar Robert Maynard

setting up the algorithms so that they can be linked by other libraries

parent 5368eef4
......@@ -7,7 +7,11 @@ vtkAvtSTMDFileFormatAlgorithm.h
vtkAvtSTMDFileFormatAlgorithm.cxx
)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/vtkAvtAlgorithmsExport.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/vtkAvtAlgorithmsExport.h")
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${AVT_DATABASE_SOURCE_DIR}/Database
${AVT_DATABASE_SOURCE_DIR}/Formats
${VISIT_COMMON_INCLUDES}
......@@ -22,6 +26,7 @@ ${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})
......
/*=========================================================================
Program: ParaView
Module: $RCSfile: pqComponentsExport.h.in,v $
Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
All rights reserved.
ParaView is a free software; you can redistribute it and/or modify it
under the terms of the ParaView license version 1.2.
See License_v1.2.txt for the full ParaView license.
A copy of this license can be obtained by contacting
Kitware Inc.
28 Corporate Drive
Clifton Park, NY 12065
USA
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#ifndef _vtkAvtAlgorithmsExport_h
#define _vtkAvtAlgorithmsExport_h
#ifndef BUILD_SHARED_LIBS
#cmakedefine BUILD_SHARED_LIBS
#endif
#if defined(WIN32) && defined(BUILD_SHARED_LIBS)
# if defined(AVTAlgorithms_EXPORTS)
# define AVTALGORITHMS_EXPORT __declspec(dllexport)
# else
# define AVTALGORITHMS_EXPORT __declspec(dllimport)
# endif
#else
# define CMFEFILTER_EXPORT
#endif
#endif //
......@@ -30,16 +30,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
========================================================================*/
#ifndef _vtkVisItReader_h
#define _vtkVisItReader_h
#ifndef _vtkAvtSTMDFileFormatAlgorithm_h
#define _vtkAvtSTMDFileFormatAlgorithm_h
#include "vtkMultiBlockDataSetAlgorithm.h"
#include "vtkAvtAlgorithmsExport.h"
//BTX
class avtSTMDFileFormat;
class avtDatabaseMetaData;
//ETX
class VTK_EXPORT vtkAvtSTMDFileFormatAlgorithm : public vtkMultiBlockDataSetAlgorithm
class AVTALGORITHMS_EXPORT vtkAvtSTMDFileFormatAlgorithm : public vtkMultiBlockDataSetAlgorithm
{
public:
static vtkAvtSTMDFileFormatAlgorithm *New();
......
/*=========================================================================
Program: ParaView
Module: vtkSTSDAvtFileFormatAlgorithm.h
Module: vtkAvtSTSDFileFormatAlgorithm.h
Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc.
All rights reserved.
......@@ -30,20 +30,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
========================================================================*/
#ifndef _vtkVisItReader_h
#define _vtkVisItReader_h
#ifndef _vtkAvtSTSDFileFormatAlgorithm_h
#define _vtkAvtSTSDFileFormatAlgorithm_h
#include "vtkDataSetAlgorithm.h"
#include "vtkAvtAlgorithmsExport.h"
//BTX
class avtFileFormat;
class avtDatabaseMetaData;
//ETX
class VTK_EXPORT vtkAvtSTSDFileFormatAlgorithm : public vtkDataSetAlgorithm
class AVTALGORITHMS_EXPORT vtkAvtSTSDFileFormatAlgorithm : public vtkDataSetAlgorithm
{
public:
static vtkSTSDAvtFileFormatAlgorithm *New();
vtkTypeMacro(vtkSTSDAvtFileFormatAlgorithm,vtkDataSetAlgorithm);
static vtkAvtSTSDFileFormatAlgorithm *New();
vtkTypeMacro(vtkAvtSTSDFileFormatAlgorithm,vtkDataSetAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
vtkSetStringMacro(FileName);
......@@ -51,8 +52,8 @@ public:
int CanReadFile(const char* fname);
protected:
vtkSTSDAvtFileFormatAlgorithm();
~vtkSTSDAvtFileFormatAlgorithm();
vtkAvtSTSDFileFormatAlgorithm();
~vtkAvtSTSDFileFormatAlgorithm();
// convenience method
virtual int RequestInformation(vtkInformation* request,
......@@ -74,7 +75,7 @@ protected:
//ETX
private:
vtkSTSDAvtFileFormatAlgorithm(const vtkSTSDAvtFileFormatAlgorithm&);
void operator = (const vtkSTSDAvtFileFormatAlgorithm&);
vtkAvtSTSDFileFormatAlgorithm(const vtkAvtSTSDFileFormatAlgorithm&);
void operator = (const vtkAvtSTSDFileFormatAlgorithm&);
};
#endif
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