Commit 37deb496 authored by Dan Lipsa's avatar Dan Lipsa

Remove pugixml as it's available in VTK. Add citygml.

parent fd39ef33
......@@ -390,6 +390,7 @@ endif()
list(APPEND _vtk_modules vtkRenderingLICOpenGL2)
list(APPEND _vtk_modules vtkDomainsChemistryOpenGL2)
list (APPEND _vtk_modules vtkIOSegY)
list (APPEND _vtk_modules vtkIOCityGML)
list(APPEND _vtk_mpi_modules vtkRenderingParallelLIC)
if(PARAVIEW_ENABLE_PYTHON)
list (APPEND _vtk_modules
......
......@@ -300,7 +300,7 @@
},
{
"name":"vtkpugixml",
"path":"ThirdParty/pugixml"
"path":"VTK/ThirdParty/pugixml"
},
{ "path":"Wrapping" },
{ "path":"VTK/Copyright.txt" },
......
......@@ -141,6 +141,12 @@ if (vtkiopdal_index GREATER 0)
${CMAKE_CURRENT_SOURCE_DIR}/Resources/proxies_pdal.xml)
endif()
list(FIND VTK_MODULES_ENABLED "vtkIOCityGML" vtkiocitygml_index)
if (vtkiocitygml_index GREATER 0)
list(APPEND requestedResourceFiles
${CMAKE_CURRENT_SOURCE_DIR}/Resources/proxies_citygml.xml)
endif()
list(FIND VTK_MODULES_ENABLED "vtkIOSegY" vtkiosegy_index)
if (vtkiosegy_index GREATER 0)
list(APPEND requestedResourceFiles
......
<ServerManagerConfiguration>
<ProxyGroup name="sources">
<SourceProxy class="vtkCityGMLReader"
label="CityGML Reader"
name="CityGML Reader">
<Documentation short_help="Reads CityGML data files.">
vtkCityGMLReader is a reader for CityGML .gml files. The output is a
multiblock dataset. We read objects at level of detail (LOD) specified
(default is 3). The leaves of the multiblock dataset (which are
polygonal datasets) have a field array with one element called
"gml_id" which corresponds to the gml:id for gml:TriangulatedSurface,
gml:MultiSurface or gml:CompositeSurface in the CityGML file. If the
polygonal dataset has a texture, we specify this with a point array called
"tcoords" and a field array with one element called "texture_uri"
containing the path to the texture file. Top level children of the
multiblock dataset have a field array with one element called
"element" which contains the CityGML element name for example:
dem:ReliefFeature, wtr:WaterBody, grp::CityObjectGroup (forest),
veg:SolitaryVegetationObject, brid:Bridge, run:Tunel, tran:Railway,
tran:Road, bldg:Building, gen:GenericCityObject, luse:LandUse
</Documentation>
<StringVectorProperty animateable="0"
command="SetFileName"
name="FileName"
number_of_elements="1">
<FileListDomain name="files" />
<Documentation>Specify file name of the CityGML data file to read.</Documentation>
</StringVectorProperty>
<IntVectorProperty command="SetLOD"
default_values="3"
name="LOD"
number_of_elements="1"
panel_visibility="advanced">
<IntRangeDomain min="0" max="4"
name="range" />
<Documentation>Specify the level of detail (LOD) to
read. Valid values are from 0 (least detailed) through 4 (most
detailed), default value is 3.</Documentation>
</IntVectorProperty>
<IntVectorProperty command="SetUseTransparencyAsOpacity"
default_values="0"
name="UseTransparencyAsOpacity"
number_of_elements="1"
panel_visibility="advanced">
<BooleanDomain name="bool" />
<Documentation>Certain input files use app:transparency as
opacity. Set this field true to show that correctly. The
default is false.</Documentation>
</IntVectorProperty>
<Hints>
<ReaderFactory extensions="gml xml"
file_description="CityGML files" />
</Hints>
</SourceProxy>
<!-- End CityGMLReader -->
</ProxyGroup>
</ServerManagerConfiguration>
vtk_module_third_party(pugixml
LIBRARIES vtkpugixml
NO_ADD_SUBDIRECTORY
)
if (VTK_USE_SYSTEM_PUGIXML)
return()
endif()
set (${vtk-module}_HDRS
${CMAKE_CURRENT_SOURCE_DIR}/pugiconfig.h
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}Module.h)
vtk_add_library(${vtk-module} pugixml.cxx)
#------------------------------------------------------------------------------
# Code copied from vtkModuleMacros.cmake, since vtkModuleMacros doesn't do this
# for vtk_module_third_party().
# Generate the export macro header for symbol visibility/Windows DLL declspec
vtk_generate_export_header(${vtk-module} EXPORT_FILE_NAME ${vtk-module}Module.h)
get_property(_buildtype TARGET ${vtk-module} PROPERTY TYPE)
if (NOT "${_buildtype}" STREQUAL STATIC_LIBRARY)
# export flags are only added when building shared libs, they cause
# mismatched visibility warnings when building statically since not all
# libraries that VTK builds don't set visibility flags. Until we get a
# time to do that, we skip visibility flags for static libraries.
if(CMAKE_VERSION VERSION_LESS 3.0)
#CMake 3.0 deprecates add_compiler_export_flags
vtk_add_compiler_export_flags(my_abi_flags)
set_property(TARGET ${vtk-module}${target_suffix} APPEND
PROPERTY COMPILE_FLAGS "${my_abi_flags}")
else()
set_property(TARGET ${vtk-module}${target_suffix}
PROPERTY CXX_VISIBILITY_PRESET "hidden")
endif()
endif()
#------------------------------------------------------------------------------
vtk_module(vtkpugixml
EXCLUDE_FROM_WRAPPING)
/**
* pugixml parser - version 1.4
* --------------------------------------------------------
* Copyright (C) 2006-2014, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
* Report bugs and download new versions at http://pugixml.org/
*
* This library is distributed under the MIT License. See notice at the end
* of this file.
*
* This work is based on the pugxml parser, which is:
* Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
*/
#ifndef HEADER_PUGICONFIG_HPP
#define HEADER_PUGICONFIG_HPP
//=============================================================================
// ParaView Modifications -- Start
//=============================================================================
// setup export macros
# include "vtkpugixmlModule.h"
# define PUGIXML_API VTKPUGIXML_EXPORT
// setup namespace mangling
# define pugi vtkpugi
//=============================================================================
// ParaView Modifications -- End
//=============================================================================
// Uncomment this to enable wchar_t mode
// #define PUGIXML_WCHAR_MODE
// Uncomment this to disable XPath
// #define PUGIXML_NO_XPATH
// Uncomment this to disable STL
// #define PUGIXML_NO_STL
// Uncomment this to disable exceptions
// #define PUGIXML_NO_EXCEPTIONS
// Set this to control attributes for public classes/functions, i.e.:
// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
// #define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
// Tune these constants to adjust memory-related behavior
// #define PUGIXML_MEMORY_PAGE_SIZE 32768
// #define PUGIXML_MEMORY_OUTPUT_STACK 10240
// #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096
// Uncomment this to switch to header-only version
// #define PUGIXML_HEADER_ONLY
// #include "pugixml.cpp"
// Uncomment this to enable long long support
// #define PUGIXML_HAS_LONG_LONG
#endif
/**
* Copyright (c) 2006-2014 Arseny Kapoulkine
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
This diff is collapsed.
This diff is collapsed.
/*=========================================================================
Program: Visualization Toolkit
Module: vtk_pugixml.h.in
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_pugixml_h
#define vtk_pugixml_h
#cmakedefine VTK_USE_SYSTEM_PUGIXML
#ifdef VTK_USE_SYSTEM_PUGIXML
# include <pugixml.hpp>
#else
# include <pugixml.h>
#endif
#endif
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