Commit 81ada26b authored by Brad King's avatar Brad King
Browse files

ENH: Added libxml2 utility to VTK. Added VTK_USE_SYSTEM_LIBXML2 option.

parent 6c2fefe7
INCLUDE(${CMAKE_ROOT}/Modules/FindLibXml2.cmake)
......@@ -1068,6 +1068,7 @@ VTK_THIRD_PARTY_OPTION(PNG png)
VTK_THIRD_PARTY_OPTION(TIFF tiff)
VTK_THIRD_PARTY_OPTION(EXPAT expat)
VTK_THIRD_PARTY_OPTION(FREETYPE freetype)
VTK_THIRD_PARTY_OPTION(LIBXML2 libxml2)
#-----------------------------------------------------------------------------
# Configure OpenGL support.
......
......@@ -9,6 +9,7 @@ VTK_THIRD_PARTY_SUBDIR(PNG vtkpng)
VTK_THIRD_PARTY_SUBDIR(TIFF vtktiff)
VTK_THIRD_PARTY_SUBDIR(EXPAT vtkexpat)
VTK_THIRD_PARTY_SUBDIR(FREETYPE vtkfreetype)
VTK_THIRD_PARTY_SUBDIR(LIBXML2 vtklibxml2)
VTK_THIRD_PARTY_SUBDIR(DICOMParser DICOMParser)
VTK_THIRD_PARTY_SUBDIR(MATERIALLIBRARY MaterialLibrary)
......
/*=========================================================================
Program: Visualization Toolkit
Module: vtk_libxml2.h
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#ifndef __vtk_libxml2_h
#define __vtk_libxml2_h
/* Use the libxml2 library configured for VTK. */
#include "vtkToolkits.h"
#ifdef VTK_USE_SYSTEM_LIBXML2
# define VTKLIBXML2_HEADER_DIR libxml
#else
# define VTKLIBXML2_HEADER_DIR vtklibxml2/libxml
#endif
/* Macro to help include a header file from the libxml2 configured for
VTK. Since libxml2 has many public header files we cannot just
include them all here. Instead user code can include this header
first and then use the macro to construct the name of the desired
header:
#include "vtk_libxml2.h"
#include VTKLIBXML2_HEADER(xmlstring.h)
*/
#define VTKLIBXML2_HEADER(x) VTKLIBXML2_HEADER0(VTKLIBXML2_HEADER_DIR/x)
#define VTKLIBXML2_HEADER0(x) VTKLIBXML2_HEADER1(x)
#define VTKLIBXML2_HEADER1(x) <x>
/* Include the top-level header here. */
#include VTKLIBXML2_HEADER(xmlversion.h)
#endif
......@@ -143,6 +143,7 @@ VTK_THIRD_PARTY_INCLUDE2(JPEG)
VTK_THIRD_PARTY_INCLUDE2(PNG)
VTK_THIRD_PARTY_INCLUDE2(TIFF)
VTK_THIRD_PARTY_INCLUDE2(EXPAT)
VTK_THIRD_PARTY_INCLUDE2(LIBXML2)
VTK_THIRD_PARTY_INCLUDE(DICOMParser DICOMParser)
VTK_THIRD_PARTY_INCLUDE(FREETYPE vtkfreetype/include)
VTK_THIRD_PARTY_INCLUDE(NetCDF vtknetcdf)
......
......@@ -84,6 +84,7 @@
#cmakedefine VTK_USE_SYSTEM_TIFF
#cmakedefine VTK_USE_SYSTEM_EXPAT
#cmakedefine VTK_USE_SYSTEM_FREETYPE
#cmakedefine VTK_USE_SYSTEM_LIBXML2
/* Whether VTK is using vfw32 and if it supports video capture */
#cmakedefine VTK_USE_VIDEO_FOR_WINDOWS
......
Supports Markdown
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