GitLab

changes for ParaView 5.1.2 compatibility and for windows/linux/macosx builds

changes for ParaView 5.1.2 compatibility and for windows/linux/macosx builds

See merge request !20

fix windows and make static with shared optional

windows fix is mostly the change to XdmfCoreReader.
On kitware's dashboards machines these template defs cause
the compiler to redefine parts of stdlib. But also
the static/shared lib had bad declspecs

Besides that I added a new option XDMF_STATIC_AND_SHARED,
that enables or disables the recent feature where compilation
produces both static and shared libraries simultaneously. The default
is ON in *Nix, and disabled on windows. If/when the windows
declspec issues are resolved we can easily enable it there.

See merge request !19

windows fix is mostly the change to XdmfCoreReader.
On kitware's dashboards machines these template defs cause
the compiler to redefine parts of stdlib. But also
the static/shared lib had bad declspecs

Besides that I added a new option XDMF_STATIC_AND_SHARED,
that enables or disables the recent feature where compilation
produces both static and shared libraries simultaneously. The default
is ON in *Nix, and disabled on windows. If/when the windows
declspec issues are resolved we can easily enable it there.

fix windows compilation

This one snuck in during the recent big big merge.
With the if WIN32 code in the headers, we get errors like
C:\PROGRA~2\MICROS~2.0\VC\bin\cl.exe ....lots skipped.... \
/FoVTK\ThirdParty\xdmf3\vtkxdmf3\core\CMakeFiles\XdmfCoreObjects.dir\XdmfHeavyDataDescription.cpp.obj \
/FdVTK\ThirdParty\xdmf3\vtkxdmf3\core\CMakeFiles\XdmfCoreObjects.dir\ \
/FS -c C:\bbd\1c569048\source-paraview\VTK\ThirdParty\xdmf3\vtkxdmf3\core\XdmfHeavyDataDescription.cpp
C:\bbd\1c569048\build\install\include\boost-1_56\boost/smart_ptr/shared_ptr.hpp(658) : error C2562: 'boost::shared_ptr<Loki::BaseVisitor>::operator []' : 'void' function returning a value
        C:\bbd\1c569048\build\install\include\boost-1_56\boost/smart_ptr/shared_ptr.hpp(653) : see declaration of 'boost::shared_ptr<Loki::BaseVisitor>::operator []'

Really really need windows tests on the xdmf dashboard, and xdmf turned on in vtk buildbot.
This was only detected all the way up in ParaView pain.

See merge request !17

This one snuck in during the recent big big merge.
With the if WIN32 code in the headers, we get errors like
C:\PROGRA~2\MICROS~2.0\VC\bin\cl.exe ....lots skipped.... \
/FoVTK\ThirdParty\xdmf3\vtkxdmf3\core\CMakeFiles\XdmfCoreObjects.dir\XdmfHeavyDataDescription.cpp.obj \
/FdVTK\ThirdParty\xdmf3\vtkxdmf3\core\CMakeFiles\XdmfCoreObjects.dir\ \
/FS -c C:\bbd\1c569048\source-paraview\VTK\ThirdParty\xdmf3\vtkxdmf3\core\XdmfHeavyDataDescription.cpp
C:\bbd\1c569048\build\install\include\boost-1_56\boost/smart_ptr/shared_ptr.hpp(658) : error C2562: 'boost::shared_ptr<Loki::BaseVisitor>::operator []' : 'void' function returning a value
        C:\bbd\1c569048\build\install\include\boost-1_56\boost/smart_ptr/shared_ptr.hpp(653) : see declaration of 'boost::shared_ptr<Loki::BaseVisitor>::operator []'

Really really need windows tests on the xdmf dashboard, and xdmf turned on in vtk buildbot.
This was only detected all the way up in ParaView pain.

Clean excess whitespace from content pulled from XML

Another attempt to fix an issue involving improperly formed strings while reading.

@demarle 

See merge request !16

expose parent class's methods to avoid comp warnings

-Woverloaded-virtual complains because XdmfGrid's get* is
hidden and made uncallable by the non virtual method of the same
in the child class. Making the child virtual is problematic since
the template parameter is not const in both.

This change ensures that both are visible to the user
and prevents the compilation warning.

See merge request !13

-Woverloaded-virtual complains because XdmfGrid's get* is
hidden and made uncallable by the non virtual method of the same
in the child class. Making the child virtual is problematic since
the template parameter is not const in both.

This change ensures that both are visible to the user
and prevents the compilation warning.

changes for fortran and shared library bulilding with python wrapping

Here are some necessary changes for fortran and for building a shared library with python wrapping

Also please turn on the testing of the fortran test code in the auto testing system.

Thanks,

Joe Hennessey

See merge request !11

Preventing TIFF tests from building when TIFF isn't found

@demarle 

To fix: https://open.cdash.org/viewBuildError.php?buildid=4414462 

See merge request !10

Fix fortran wrapper

Fix some fortran declarations as discussed in xdmf/xdmf!8

@demarle  @AndrewBurns 

See merge request !9

Import arl latest

Tests on my linux workstation are here
https://open.cdash.org/buildSummary.php?buildid=4409696

The three failing tests fail here no matter what branch I am on so confident they are not introduced with this commit.
Tested with shared/static, wrap_python and no_wrap python.
Have not tested dsm, or on windows or mac or by importing into VTK yet.
Not entirely sure I got the new polyhedra merged in correctly.


See merge request !8

See VTK's a3bd88db "remove xml2's deprecated reference() function"