Commit 505b8c09 authored by David C. Lonie's avatar David C. Lonie

Merge the Rendering/MathText module into Rendering/FreeType.

The MathText module doesn't need to be built separately from FreeType.

Change-Id: Ib051e0608a644e886a80405dcd298c1a47fd0544
parent f5eb8a44
......@@ -3,7 +3,6 @@ vtk_module(vtkIOExport
StandAlone
DEPENDS
vtkCommonCore
vtkRenderingMathText
vtkRenderingContext2D
vtkRenderingCore
vtkRenderingFreeType
......
......@@ -3,7 +3,6 @@ vtk_module(vtkRenderingAnnotation
Rendering
DEPENDS
vtkRenderingFreeType
vtkRenderingMathText
vtkImagingColor
TEST_DEPENDS
vtkIOGeometry
......
......@@ -6,7 +6,6 @@ vtk_module(vtkRenderingContext2D
vtkCommonDataModel
vtkCommonMath
vtkCommonTransforms
vtkRenderingMathText
vtkRenderingCore
vtkRenderingOpenGL
vtkRenderingFreeType
......
......@@ -2,6 +2,9 @@ set(Module_SRCS
vtkFreeTypeStringToImage.cxx
vtkFreeTypeUtilities.cxx
vtkFreeTypeTools.cxx
vtkMathTextUtilities.cxx
vtkMathTextActor.cxx
vtkMathTextActor3D.cxx
vtkTextActor3D.cxx
vtkTextActor.cxx
vtkScaledTextActor.cxx
......@@ -21,6 +24,11 @@ set(Module_SRCS
fonts/face_times_italic.cxx
)
set_source_files_properties(
vtkMathTextUtilities
ABSTRACT
)
set_source_files_properties(
vtkFreeTypeTools
vtkFreeTypeUtilities
......
......@@ -25,13 +25,13 @@
#ifndef __vtkMathTextActor_h
#define __vtkMathTextActor_h
#include "vtkRenderingMathTextModule.h" // For export macro
#include "vtkRenderingFreeTypeModule.h" // For export macro
#include "vtkTextActor.h"
class vtkTextProperty;
class vtkImageData;
class VTKRENDERINGMATHTEXT_EXPORT vtkMathTextActor : public vtkTextActor
class VTKRENDERINGFREETYPE_EXPORT vtkMathTextActor : public vtkTextActor
{
public:
vtkTypeMacro(vtkMathTextActor,vtkTextActor);
......
......@@ -28,10 +28,10 @@
#ifndef __vtkMathTextActor3D_h
#define __vtkMathTextActor3D_h
#include "vtkRenderingMathTextModule.h" // For export macro
#include "vtkRenderingFreeTypeModule.h" // For export macro
#include "vtkTextActor3D.h"
class VTKRENDERINGMATHTEXT_EXPORT vtkMathTextActor3D : public vtkTextActor3D
class VTKRENDERINGFREETYPE_EXPORT vtkMathTextActor3D : public vtkTextActor3D
{
public:
static vtkMathTextActor3D *New();
......
......@@ -21,7 +21,7 @@
#ifndef __vtkMathTextUtilities_h
#define __vtkMathTypeUtilities_h
#include "vtkRenderingMathTextModule.h" // For export macro
#include "vtkRenderingFreeTypeModule.h" // For export macro
#include "vtkObject.h"
class vtkImageData;
......@@ -31,14 +31,14 @@ class vtkTextProperty;
//----------------------------------------------------------------------------
// Singleton cleanup
class VTKRENDERINGMATHTEXT_EXPORT vtkMathTextUtilitiesCleanup
class VTKRENDERINGFREETYPE_EXPORT vtkMathTextUtilitiesCleanup
{
public:
vtkMathTextUtilitiesCleanup();
~vtkMathTextUtilitiesCleanup();
};
class VTKRENDERINGMATHTEXT_EXPORT vtkMathTextUtilities : public vtkObject
class VTKRENDERINGFREETYPE_EXPORT vtkMathTextUtilities : public vtkObject
{
public:
vtkTypeMacro(vtkMathTextUtilities, vtkObject);
......
......@@ -2,7 +2,6 @@ vtk_module(vtkRenderingGL2PS
TCL_NAME vtkRenderingGLtoPS
DEPENDS
vtkRenderingContext2D
vtkRenderingMathText
vtkgl2ps
TEST_DEPENDS
vtkTestingRendering
......
set(Module_SRCS
vtkMathTextUtilities.cxx
vtkMathTextActor.cxx
vtkMathTextActor3D.cxx
)
set_source_files_properties(
vtkMathTextUtilities
ABSTRACT
)
vtk_module_library(${vtk-module} ${Module_SRCS})
vtk_module(vtkRenderingMathText
DEPENDS
vtkRenderingCore
vtkRenderingFreeType
)
vtk_module(vtkRenderingMatplotlib
IMPLEMENTS
vtkRenderingMathText
vtkRenderingFreeType
DEPENDS
vtkImagingCore
vtkRenderingCore
......
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