Commit c4b66cad authored by Dave DeMarle's avatar Dave DeMarle

Fix issues the dashboards turned up.

Two comp warnins and a typo in my fix for static/shared build
capability. Also, the triangle.xmf dataset was just wrong.

Change-Id: I587350939c06cf7f820fa0312749908ee7cbbec9
parent 10d20e75
......@@ -1385,7 +1385,6 @@ int vtkXdmf3Reader::RequestData(vtkInformation *,
// Collect information about what spatial extent is requested.
unsigned int updatePiece = 0;
unsigned int updateNumPieces = 1;
int ghost_levels = 0;
if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_PIECE_NUMBER()) &&
outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_NUMBER_OF_PIECES()))
{
......@@ -1394,18 +1393,23 @@ int vtkXdmf3Reader::RequestData(vtkInformation *,
updateNumPieces = static_cast<unsigned int>(
outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_NUMBER_OF_PIECES()));
}
/*
int ghost_levels = 0;
if (outInfo->Has(
vtkStreamingDemandDrivenPipeline::UPDATE_NUMBER_OF_GHOST_LEVELS()))
{
ghost_levels = outInfo->Get(
vtkStreamingDemandDrivenPipeline::UPDATE_NUMBER_OF_GHOST_LEVELS());
}
*/
/*
int update_extent[6] = {0, -1, 0, -1, 0, -1};
if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_EXTENT()))
{
outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_EXTENT(),
update_extent);
}
*/
// Collect information about what temporal extent is requested.
double time;
......
8af89a22896bdea6810fc4828b8260d5
8c7b8de097e32ab4c4c227af24dadeff
......@@ -12,7 +12,7 @@ if(MSVC10)
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
endif(MSVC10)
if(BUILD_SHARED)
if(BUILD_SHARED_LIBS)
set(LIBTYPE SHARED)
else()
set(LIBTYPE STATIC)
......@@ -270,7 +270,7 @@ if(NOT XDMF_BUILD_CORE_ONLY)
vtk_target_install(vtkxdmf3)
if(WIN32)
if (BUILD_SHARED)
if (BUILD_SHARED_LIBS)
set_target_properties(vtkxdmf3 PROPERTIES
DEFINE_SYMBOL vtkxdmf3_EXPORTS)
endif()
......
......@@ -14,7 +14,7 @@ if(VERSION_CONTROL_AUTOUPDATE OR
endif(VERSION_CONTROL_AUTOUPDATE OR
NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/XdmfVersion.hpp)
if(BUILD_SHARED)
if(BUILD_SHARED_LIBS)
set(LIBTYPE SHARED)
else()
set(LIBTYPE STATIC)
......@@ -144,7 +144,7 @@ vtk_target_install(XdmfCore)
if(WIN32)
add_definitions(-D_HDF5USEDLL_ -D_HDF5USEHLDLL_)
if (BUILD_SHARED)
if (BUILD_SHARED_LIBS)
set_target_properties(XdmfCore PROPERTIES
DEFINE_SYMBOL XdmfCore_EXPORTS)
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