Commit 78f9d207 authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'fix-vtkfreetype-with-vtkkwiml'

17fa0866 vtkfreetype: Use KWIML for integer sizes
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1025
parents f04a0549 17fa0866
Pipeline #2676 running with stage
vtk_module(vtkfreetype EXCLUDE_FROM_WRAPPING
DEPENDS vtkzlib)
DEPENDS vtkzlib vtkkwiml)
......@@ -76,8 +76,9 @@ FT_BEGIN_HEADER
#endif
/* VTK_FREETYPE_CHANGE use VTK's sizes instead of the big test */
#define FT_SIZEOF_INT ${VTK_SIZEOF_INT}
#define FT_SIZEOF_LONG ${VTK_SIZEOF_LONG}
#include "vtk_kwiml.h"
#define FT_SIZEOF_INT KWIML_ABI_SIZEOF_INT
#define FT_SIZEOF_LONG KWIML_ABI_SIZEOF_LONG
/* FT_UNUSED is a macro used to indicate that a given parameter is not */
......
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