Don't bundle TinyXML about osgearth

[jasonbeverage]

Hi Volter,

The whole point of us moving to TinyXML instead of the old Expat based
XML code was to avoid having to have yet another external dependency
to build against.

If you could send in a patch that could optionally allow us to build
against the embedded TinyXML or an external one if it was found I
think that would be more appropriate than removing the embedded
TinyXML completely.

Thanks,

Jason

On Sun, Sep 11, 2011 at 8:51 AM, volter
[email protected]
wrote:

Please don't bundle TinyXML.

I threw together a Cmake script and patched Cmakelists.txt:

http://www.geofrogger.net/review/osgEarth-2.0-FindTinyXML.cmake
http://www.geofrogger.net/review/osgEarth-2.0-tinyxml.patch

Note that the patch was written for version 2.0.0.

Reply to this email directly or view it on GitHub:
#29

[volter]

I hope this works. I can't really test it because osgearth trunk doesn't build for me -- probably because of my OpenSceneGraph version.

The patch modifies CMakeLists.txt and src/osgearth/CMakeLists.txt and adds a find script in CMakeModules.

-D WITH_EXTERNAL_TINYXML causes the find script to run.

The find scripts has TINYXML_INCLUDE_DIR and TINYXML_LIBRARY. If both have values, TINYXML_FOUND is true.

If TINYXML_FOUND is true in src/osgearth/CMakeLists.txt, the bundled TinyXML files are not compiled. Therefore TINYXML_INCLUDE_DIR and TINYXML_LIBRARY are turned to use.

http://www.geofrogger.net/review/osgearth-external-tinyxml.patch

[jasonbeverage]

Hi Volter,

I've pushed this change, thanks!

Jason

On Wed, Oct 12, 2011 at 6:20 PM, volter
[email protected]
wrote:

I hope this works. I can't really test it because osgearth trunk doesn't build for me -- probably because of my OpenSceneGraph version.

The patch modifies CMakeLists.txt and src/osgearth/CMakeLists.txt and adds a find script in CMakeModules.

-D WITH_EXTERNAL_TINYXML causes the find script to run.

The find scripts has TINYXML_INCLUDE_DIR and TINYXML_LIBRARY. If both have values, TINYXML_FOUND is true.

If TINYXML_FOUND is true in src/osgearth/CMakeLists.txt, the bundled TinyXML files are not compiled. Therefore TINYXML_INCLUDE_DIR and TINYXML_LIBRARY are turned to use.

http://www.geofrogger.net/review/osgearth-external-tinyxml.patch

Reply to this email directly or view it on GitHub:
#29 (comment)

[jasonbeverage]

This is in the trunk now.