Commit 3c67759b authored by Marcus D. Hanwell's avatar Marcus D. Hanwell
Browse files

Made the Filters modules a private dependency

This makes the vtkFilters* modules a private dependency of the
vtkRenderingCore library, and fixes any issues introduced in other
modules that implicitly relied on these modules.

Change-Id: I2421aa54fc5b9132e0b91ae404263c6f663822f2
parent 039f702a
......@@ -3,8 +3,10 @@ vtk_module(vtkDomainsChemistry
StandAlone
DEPENDS
vtkCommonDataModel
vtkIOXML
vtkRenderingCore
PRIVATE_DEPENDS
vtkIOXML
vtkFiltersSources
TEST_DEPENDS
vtkTestingCore
vtkTestingRendering
......
......@@ -6,6 +6,7 @@ vtk_module(vtkFiltersParallel
vtkFiltersExtraction
vtkRenderingCore
vtkFiltersModeling
vtkFiltersGeometry
TEST_DEPENDS
vtkParallelMPI
vtkTestingRendering
......
......@@ -6,6 +6,8 @@ vtk_module(vtkGUISupportQt
vtkRenderingOpenGL
vtkInteractionStyle
vtkImagingCore
PRIVATE_DEPENDS
vtkFiltersExtraction
TEST_DEPENDS
vtkTestingCore
EXCLUDE_FROM_WRAPPING
......
......@@ -13,6 +13,7 @@ vtk_module(vtkIOExport
vtkImagingCore
PRIVATE_DEPENDS
vtkIOImage
vtkFiltersGeometry
TEST_DEPENDS
vtkCommonColor
vtkChartsCore
......
......@@ -4,6 +4,8 @@ vtk_module(vtkIOImport
DEPENDS
vtkCommonCore
vtkRenderingCore
PRIVATE_DEPENDS
vtkFiltersSources
TEST_DEPENDS
vtkRenderingOpenGL
vtkTestingRendering
......
......@@ -3,4 +3,7 @@ vtk_module(vtkInteractionStyle
Rendering
IMPLEMENTS
vtkRenderingCore
PRIVATE_DEPENDS
vtkFiltersSources
vtkFiltersExtraction
)
......@@ -4,6 +4,8 @@ vtk_module(vtkRenderingAnnotation
DEPENDS
vtkRenderingFreeType
vtkImagingColor
PRIVATE_DEPENDS
vtkFiltersSources
TEST_DEPENDS
vtkIOGeometry
vtkRenderingFreeTypeOpenGL
......
......@@ -4,15 +4,14 @@ vtk_module(vtkRenderingCore
DEPENDS
vtkCommonExecutionModel
vtkCommonTransforms
PRIVATE_DEPENDS
vtkFiltersSources
vtkFiltersGeneral
vtkFiltersGeometry
vtkFiltersExtraction
PRIVATE_DEPENDS
vtksys
TEST_DEPENDS
vtkIOXML
vtkTestingCore
vtkTestingRendering
vtkRenderingContext2D
vtkRenderingOpenGL
)
......@@ -3,4 +3,6 @@ vtk_module(vtkRenderingLabel
Rendering
DEPENDS
vtkRenderingFreeType
PRIVATE_DEPENDS
vtkFiltersExtraction
)
......@@ -160,6 +160,7 @@ foreach(exe
vtkInteractionStyle
vtkImagingSources
vtkImagingGeneral
vtkFiltersSources
vtkIOCore
${OPENGL_gl_LIBRARY})
if(APPLE)
......
......@@ -23,5 +23,6 @@ vtk_module(vtkRenderingOpenGL
vtkImagingGeneral
vtkImagingSources
vtkFiltersProgrammable
vtkFiltersSources
vtkRenderingAnnotation
)
......@@ -4,7 +4,9 @@ vtk_module(vtkRenderingQt
DEPENDS
vtkRenderingLabel
vtkGUISupportQt
PRIVATE_DEPENDS
vtkFiltersTexture
vtkFiltersSources
TEST_DEPENDS
vtkTestingCore
)
......@@ -7,6 +7,8 @@ vtk_module(vtkRenderingVolumeOpenGL
vtkRenderingOpenGL
PRIVATE_DEPENDS
vtksys
vtkFiltersGeneral
vtkFiltersSources
TEST_DEPENDS
vtkTestingCore
vtkTestingRendering
......
......@@ -10,6 +10,8 @@ vtk_module(vtkViewsInfovis
vtkFiltersModeling
vtkFiltersImaging
vtkCommonColor
PRIVATE_DEPENDS
vtkFiltersGeometry
TEST_DEPENDS
vtkTestingRendering
vtkIOInfovis
......
......@@ -3,6 +3,9 @@ vtk_module(vtkWebCore
Web
DEPENDS
vtkCommonCore
PRIVATE_DEPENDS
vtksys
vtkFiltersGeneral
vtkPython
vtkIOCore
vtkIOImage
......
......@@ -3,9 +3,11 @@ vtk_module(vtkWebGLExporter
Web
DEPENDS
vtkIOExport
PRIVATE_DEPENDS
vtksys
vtkFiltersGeometry
vtkInteractionWidgets
vtkRenderingCore
vtksys
COMPILE_DEPENDS
vtkUtilitiesEncodeString
)
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