Commit 59e14363 authored by Sebastien Barre's avatar Sebastien Barre
Browse files

ENH: fix MetaIO in VTK; MetaIO: headers were installed in...

ENH: fix MetaIO in VTK; MetaIO: headers were installed in /include/vtk-5.2/Utilities/MetaIO for VTK and in /include/InsightToolkit/Utilities/MetaIO for ITK. While this seems OK for ITK, this not for VTK; the support libs found in VTK's Utilities install their headers in /include/vtk-5.2 (the extra 'Utilities' subdir would prevent them from being found). The metaIOConfig.h header was not installed. Furthermore, headers were installed in "/MetaIO" instead of "/vtkmetaio", which seems to be the required syntax (as implemented in a few VTK's classes: #include "vtkmetaio/metaTypes.h"). MetaIO is also missing support for a system's MetaIO vs. a VTK's MetaIO (as demonstrated by VTK's expat, freetype, jpeg, tiff, etc): I'll leave that to MetaIO people. Finally, VTK_USE_METAIO was not exported at all: since this is an option, people could link against an installed VTK and expect MetaIO, whereas it was never built.... Considering that MetaIO is not as widely used as PNG, or JPEG, I didn't tackle the support for a system's MetaIO library.
parent afe3c4b3
......@@ -66,18 +66,18 @@ SET(VTK_LANGUAGES "@VTK_LANGUAGES@")
# VTK Configuration options.
SET(VTK_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
SET(VTK_DEBUG_LEAKS "@VTK_DEBUG_LEAKS@")
SET(VTK_USE_TK "@VTK_USE_TK@")
SET(VTK_HAVE_VP1000 "@VTK_HAVE_VP1000@")
SET(VTK_USE_MANGLED_MESA "@VTK_USE_MANGLED_MESA@")
SET(VTK_LEGACY_REMOVE "@VTK_LEGACY_REMOVE@")
SET(VTK_LEGACY_SILENT "@VTK_LEGACY_SILENT@")
SET(VTK_MPIRUN_EXE "@VTK_MPIRUN_EXE_CONFIG@")
SET(VTK_MPI_NUMPROC_FLAG "@VTK_MPI_NUMPROC_FLAG_CONFIG@")
SET(VTK_MPI_CLIENT_POSTFLAGS "@VTK_MPI_CLIENT_POSTFLAGS_CONFIG@")
SET(VTK_MPI_CLIENT_PREFLAGS "@VTK_MPI_CLIENT_PREFLAGS_CONFIG@")
SET(VTK_MPI_MAX_NUMPROCS "@VTK_MPI_MAX_NUMPROCS_CONFIG@")
SET(VTK_MPI_NUMPROC_FLAG "@VTK_MPI_NUMPROC_FLAG_CONFIG@")
SET(VTK_MPI_POSTFLAGS "@VTK_MPI_POSTFLAGS_CONFIG@")
SET(VTK_MPI_PREFLAGS "@VTK_MPI_PREFLAGS_CONFIG@")
SET(VTK_MPI_CLIENT_PREFLAGS "@VTK_MPI_CLIENT_PREFLAGS_CONFIG@")
SET(VTK_MPI_SERVER_PREFLAGS "@VTK_MPI_SERVER_PREFLAGS_CONFIG@")
SET(VTK_MPI_CLIENT_POSTFLAGS "@VTK_MPI_CLIENT_POSTFLAGS_CONFIG@")
SET(VTK_MPI_SERVER_POSTFLAGS "@VTK_MPI_SERVER_POSTFLAGS_CONFIG@")
SET(VTK_MPI_SERVER_PREFLAGS "@VTK_MPI_SERVER_PREFLAGS_CONFIG@")
SET(VTK_OPENGL_HAS_OSMESA "@VTK_OPENGL_HAS_OSMESA@")
SET(VTK_USE_64BIT_IDS "@VTK_USE_64BIT_IDS@")
SET(VTK_USE_ANSI_STDLIB "@VTK_USE_ANSI_STDLIB@")
......@@ -85,26 +85,27 @@ SET(VTK_USE_BOOST "@VTK_USE_BOOST@")
SET(VTK_USE_CARBON "@VTK_USE_CARBON@")
SET(VTK_USE_CG_SHADERS "@VTK_USE_CG_SHADERS@")
SET(VTK_USE_COCOA "@VTK_USE_COCOA@")
SET(VTK_USE_GL2PS "@VTK_USE_GL2PS@")
SET(VTK_USE_GLSL_SHADERS "@VTK_USE_GLSL_SHADERS@")
SET(VTK_USE_GUISUPPORT "@VTK_USE_GUISUPPORT@")
SET(VTK_USE_INFOVIS "@VTK_USE_INFOVIS@")
SET(VTK_USE_MANGLED_MESA "@VTK_USE_MANGLED_MESA@")
SET(VTK_USE_MATROX_IMAGING "@VTK_USE_MATROX_IMAGING@")
SET(VTK_USE_METAIO "@VTK_USE_METAIO@")
SET(VTK_USE_MFC "@VTK_USE_MFC@")
SET(VTK_USE_QVTK "@VTK_USE_QVTK@")
SET(VTK_USE_MPI "@VTK_USE_MPI@")
SET(VTK_USE_PARALLEL "@VTK_USE_PARALLEL@")
SET(VTK_USE_INFOVIS "@VTK_USE_INFOVIS@")
SET(VTK_USE_VIEWS "@VTK_USE_VIEWS@")
SET(VTK_USE_QVTK "@VTK_USE_QVTK@")
SET(VTK_USE_RENDERING "@VTK_USE_RENDERING@")
SET(VTK_USE_TK "@VTK_USE_TK@")
SET(VTK_USE_TK "@VTK_USE_TK@")
SET(VTK_USE_VIDEO_FOR_WINDOWS "@VTK_USE_VIDEO_FOR_WINDOWS@")
SET(VTK_USE_GL2PS "@VTK_USE_GL2PS@")
SET(VTK_USE_VIEWS "@VTK_USE_VIEWS@")
SET(VTK_USE_VOLUMEPRO_1000 "@VTK_USE_VOLUMEPRO_1000@")
SET(VTK_USE_X "@VTK_USE_X@")
SET(VTK_WRAP_JAVA "@VTK_WRAP_JAVA@")
SET(VTK_WRAP_PYTHON "@VTK_WRAP_PYTHON@")
SET(VTK_WRAP_TCL "@VTK_WRAP_TCL@")
SET(VTK_LEGACY_REMOVE "@VTK_LEGACY_REMOVE@")
SET(VTK_LEGACY_SILENT "@VTK_LEGACY_SILENT@")
SET(VTK_USE_VOLUMEPRO_1000 "@VTK_USE_VOLUMEPRO_1000@")
# The Hybrid and VolumeRendering kits are now switched with Rendering.
SET(VTK_USE_HYBRID "@VTK_USE_RENDERING@")
......
......@@ -184,6 +184,7 @@ VTK_THIRD_PARTY_INCLUDE(FREETYPE vtkfreetype/include)
VTK_THIRD_PARTY_INCLUDE(NetCDF vtknetcdf)
VTK_THIRD_PARTY_INCLUDE(Exodus2 vtkexodus2/include)
VTK_THIRD_PARTY_INCLUDE(MATERIALLIBRARY MaterialLibrary)
VTK_THIRD_PARTY_INCLUDE(VERDICT verdict)
# Include GUI support
IF(VTK_USE_GUISUPPORT)
......
......@@ -123,6 +123,9 @@
/* Whether the user has linked in the MPEG2 library or not */
#cmakedefine VTK_USE_MPEG2_ENCODER
/* Whether the user has built the MetaIO library or not */
#cmakedefine VTK_USE_METAIO
/*--------------------------------------------------------------------------*/
/* Setup VTK based on platform features and configuration. */
......
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