Commit 358a5887 authored by Dan Lipsa's avatar Dan Lipsa
Browse files

Remove VTK_USE_DISPLAY from CMakeLists, cxx and h.in files.

This variable is not set anywhere, only tested. Additional tests
are included because of this change : tcl:squadViewer,
cxx:RenderNonFinite, SurfacePlusEdges, TestLabelPlacementMapper

Change-Id: I1ffa1462d6fb4aed3fb0ee60ec94ffae93b48fe0
parent a5e2fb55
......@@ -14,7 +14,7 @@
=========================================================================*/
#include "vtkOutputWindow.h"
#include "vtkToolkits.h"
#if defined( _WIN32 ) && !defined( VTK_USE_X ) && defined( VTK_USE_DISPLAY )
#if defined( _WIN32 ) && !defined( VTK_USE_X )
#include "vtkWin32OutputWindow.h"
#endif
#include "vtkCommand.h"
......@@ -153,7 +153,7 @@ vtkOutputWindow* vtkOutputWindow::GetInstance()
// if the factory failed to create the object,
// then destroy it now, as vtkDebugLeaks::ConstructClass was called
// with "vtkOutputWindow", and not the real name of the class
#if defined( _WIN32 ) && !defined( VTK_USE_X ) && defined( VTK_USE_DISPLAY )
#if defined( _WIN32 ) && !defined( VTK_USE_X )
#ifdef VTK_DEBUG_LEAKS
vtkDebugLeaks::DestructClass("vtkOutputWindow");
#endif
......
if (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
if (VTK_USE_RENDERING)
if(VTK_USE_TK)
vtk_add_test_tcl(squadViewer)
endif()
......
......@@ -103,16 +103,11 @@ vtk_add_test_cxx(
TestTStripsNormalsColorsTCoords.cxx
TestTStripsNormalsTCoords.cxx
TestTStripsTCoords.cxx
RenderNonFinite.cxx
SurfacePlusEdges.cxx
TestLabelPlacementMapper.cxx
)
if(VTK_USE_DISPLAY)
vtk_add_test_cxx(
RenderNonFinite.cxx
SurfacePlusEdges.cxx
TestLabelPlacementMapper.cxx
)
endif()
set(VTK_USE_GLSL_SHADERS FALSE)
if(VTK_USE_GLSL_SHADERS)
# Tests testing GLSL Shaders.
......
......@@ -37,9 +37,6 @@
# define VTK_MATERIALS_DIRS "@VTK_MATERIALS_DIRS@"
#endif
/* Should VTK use the display? */
#cmakedefine VTK_USE_DISPLAY
/* Options for GPUInfo */
#cmakedefine VTK_USE_DIRECTX
#cmakedefine VTK_USE_CORE_GRAPHICS
......
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