Commit 8ca31a70 authored by bonnell's avatar bonnell

Move avtTimeLoopFilter and avtTimeLoopCollectorFilter from...

Move avtTimeLoopFilter and avtTimeLoopCollectorFilter from avt/Pipeline/AbstractFilters to avt/Filters to prevent cyclical link dependencies.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21035 18c085ea-50e0-402c-830e-de6fd14e8384
parent ce9168b9
......@@ -60,6 +60,10 @@
# Hank Childs, Tue Mar 13 12:59:07 PDT 2012
# Move avtDatasetOnDemandFilter from Pipeline/AbstractFilters directory.
#
# Kathleen Biagas, Tue May 28 17:02:23 MST 2013
# Move avtTimeLoopFilter and avtTimeLoopCollectorFilter from
# Pipeline/AbstractFilters directory.
#
#****************************************************************************/
SET(AVTFILTERS_SOURCES
......@@ -112,6 +116,8 @@ avtSummationFilter.C
avtSurfaceFilter.C
avtThresholdFilter.C
avtTiledImageCompositor.C
avtTimeLoopCollectorFilter.C
avtTimeLoopFilter.C
avtTransform.C
avtVertexNormalsFilter.C
avtWarpFilter.C
......@@ -121,15 +127,8 @@ avtWorldSpaceToImageSpaceTransform.C
avtXRayFilter.C
)
#IF(HAVE_LIB_R)
# LIST(APPEND AVTFILTERS_SOURCES avtRExtremesFilter.C)
#ENDIF(HAVE_LIB_R)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
IF(HAVE_LIB_R)
${R_INCLUDE_DIR}
ENDIF(HAVE_LIB_R)
${VISIT_COMMON_INCLUDES}
${VISIT_SOURCE_DIR}/visit_vtk/full
${VISIT_SOURCE_DIR}/visit_vtk/lightweight
......
......@@ -43,7 +43,7 @@
#ifndef AVT_TIME_LOOP_COLLETOR_FILTER_H
#define AVT_TIME_LOOP_COLLETOR_FILTER_H
#include <pipeline_exports.h>
#include <filters_exports.h>
#include <vector>
......@@ -66,7 +66,7 @@
//
// ****************************************************************************
class PIPELINE_API avtTimeLoopCollectorFilter
class AVTFILTERS_API avtTimeLoopCollectorFilter
: virtual public avtTimeLoopFilter,virtual public avtDatasetToDatasetFilter
{
public:
......
......@@ -43,7 +43,7 @@
#ifndef AVT_TIME_LOOP_FILTER_H
#define AVT_TIME_LOOP_FILTER_H
#include <pipeline_exports.h>
#include <filters_exports.h>
#include <vectortypes.h>
#include <avtFilter.h>
......@@ -82,7 +82,7 @@
//
// ****************************************************************************
class PIPELINE_API avtTimeLoopFilter : virtual public avtFilter
class AVTFILTERS_API avtTimeLoopFilter : virtual public avtFilter
{
public:
avtTimeLoopFilter();
......
......@@ -48,6 +48,9 @@
# Hank Childs, Tue Mar 13 12:59:07 PDT 2012
# Move avtDatasetOnDemandFilter to Filters directory.
#
# Kathleen Biagas, Tue May 28 17:02:54 MST 2013
# Move avtTimeLoopFilter and avtTimeLoopCollectorFilter to Filters directory.
#
#****************************************************************************/
SET(DATA_SOURCES
......@@ -170,8 +173,6 @@ AbstractFilters/avtStructuredChunkDataTreeIterator.C
AbstractFilters/avtStructuredMeshChunker.C
AbstractFilters/avtStructuredMeshPartitionStrategy.C
AbstractFilters/avtSweepPlanePartitionStrategy.C
AbstractFilters/avtTimeLoopCollectorFilter.C
AbstractFilters/avtTimeLoopFilter.C
)
SET(SINKS_SOURCES
......@@ -235,7 +236,6 @@ ${VTK_INCLUDE_DIRS}
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
# Unless we're doing a VISIT_DBIO_ONLY build then we need avtmath
IF(NOT VISIT_DBIO_ONLY)
SET(AVTMATH avtmath)
......
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