Commit e0feb4f5 authored by Dave Moxey's avatar Dave Moxey

Bump TinyXML to 2.6.2

parent 0d0ab154
......@@ -26,22 +26,22 @@ OPTION(THIRDPARTY_BUILD_TINYXML
IF (THIRDPARTY_BUILD_TINYXML)
INCLUDE(ExternalProject)
EXTERNALPROJECT_ADD(
tinyxml-2.4.3
tinyxml-2.6.2
PREFIX ${TPSRC}
URL ${TPURL}/tinyxml_2_4_3-1.tar.bz2
URL_MD5 "a00f5e3b547b803977c5744547a688f7"
URL http://ae-nektar.ae.ic.ac.uk/~dmoxey/tinyxml_2_6_2.tar.bz2
URL_HASH SHA256=32db85cff26260a9140860e8393df59df79ec59f45a9df18524f9cdd21d0f238
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPSRC}/tinyxml-2.4.3
BINARY_DIR ${TPBUILD}/tinyxml-2.4.3
TMP_DIR ${TPBUILD}/tinyxml-2.4.3-tmp
SOURCE_DIR ${TPSRC}/tinyxml-2.6.2
BINARY_DIR ${TPBUILD}/tinyxml-2.6.2
TMP_DIR ${TPBUILD}/tinyxml-2.6.2-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND ${CMAKE_COMMAND}
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-DCMAKE_INSTALL_PREFIX:PATH=${TPDIST}
-DCMAKE_CXX_FLAGS:STRING=-DTIXML_USE_STL
${TPSRC}/tinyxml-2.4.3
${TPSRC}/tinyxml-2.6.2
)
SET(TINYXML_LIBRARY tinyxml CACHE FILEPATH
"TinyXML library" FORCE)
......@@ -53,7 +53,7 @@ IF (THIRDPARTY_BUILD_TINYXML)
MESSAGE(STATUS "Build TinyXML: ${TPDIST}/${TINYXML_LIBRARY}.a")
SET(TINYXML_CONFIG_INCLUDE_DIR ${TPINC})
ELSE()
ADD_CUSTOM_TARGET(tinyxml-2.4.3 ALL)
ADD_CUSTOM_TARGET(tinyxml-2.6.2 ALL)
MESSAGE(STATUS "Found TinyXML: ${TINYXML_LIBRARY}")
SET(TINYXML_CONFIG_INCLUDE_DIR ${TINYXML_INCLUDE_DIR})
ENDIF (THIRDPARTY_BUILD_TINYXML)
......
......@@ -967,7 +967,7 @@ namespace Nektar
std::string elementStr;
while(elementChild)
{
if (elementChild->Type() == TiXmlNode::TEXT)
if (elementChild->Type() == TiXmlNode::TINYXML_TEXT)
{
elementStr += elementChild->ToText()->ValueStr();
}
......
......@@ -1732,7 +1732,7 @@ namespace Nektar
{
TiXmlNode *node = parameter->FirstChild();
while (node && node->Type() != TiXmlNode::TEXT)
while (node && node->Type() != TiXmlNode::TINYXML_TEXT)
{
node = node->NextSibling();
}
......@@ -2180,7 +2180,7 @@ namespace Nektar
// Comments appear as nodes just like elements. We are
// specifically looking for text in the body of the
// definition.
while(varChild && varChild->Type() != TiXmlNode::TEXT)
while(varChild && varChild->Type() != TiXmlNode::TINYXML_TEXT)
{
varChild = varChild->NextSibling();
}
......
......@@ -348,7 +348,7 @@ ADD_DEFINITIONS(-DLIB_UTILITIES_EXPORTS)
ADD_NEKTAR_LIBRARY(LibUtilities lib ${NEKTAR_LIBRARY_TYPE} ${LibUtilitySources} ${LibUtilityHeaders})
ADD_DEPENDENCIES(LibUtilities modmetis-5.1.0 boost tinyxml-2.4.3 zlib-1.2.7)
ADD_DEPENDENCIES(LibUtilities modmetis-5.1.0 boost tinyxml-2.6.2 zlib-1.2.7)
### Libraries needed specifically by LibUtilities ###
......
......@@ -108,7 +108,7 @@ namespace Nektar
// Comments appear as nodes just like elements.
// We are specifically looking for text in the body
// of the definition.
while(boundaryRegionChild && boundaryRegionChild->Type() != TiXmlNode::TEXT)
while(boundaryRegionChild && boundaryRegionChild->Type() != TiXmlNode::TINYXML_TEXT)
{
boundaryRegionChild = boundaryRegionChild->NextSibling();
}
......
......@@ -414,7 +414,7 @@ namespace Nektar
while (vertexBody)
{
// Accumulate all non-comment body data.
if (vertexBody->Type() == TiXmlNode::TEXT)
if (vertexBody->Type() == TiXmlNode::TINYXML_TEXT)
{
vertexBodyStr += vertexBody->ToText()->Value();
vertexBodyStr += " ";
......@@ -1035,7 +1035,7 @@ namespace Nektar
TiXmlNode* elementChild = multidomains->FirstChild();
while(elementChild && elementChild->Type() != TiXmlNode::TEXT)
while(elementChild && elementChild->Type() != TiXmlNode::TINYXML_TEXT)
{
elementChild = elementChild->NextSibling();
}
......@@ -1069,7 +1069,7 @@ namespace Nektar
// find the non comment portion of the body.
TiXmlNode* elementChild = domain->FirstChild();
while(elementChild && elementChild->Type() != TiXmlNode::TEXT)
while(elementChild && elementChild->Type() != TiXmlNode::TINYXML_TEXT)
{
elementChild = elementChild->NextSibling();
}
......@@ -1192,7 +1192,7 @@ namespace Nektar
while(elementChild)
{
// Accumulate all non-comment element data
if (elementChild->Type() == TiXmlNode::TEXT)
if (elementChild->Type() == TiXmlNode::TINYXML_TEXT)
{
elementStr += elementChild->ToText()->ValueStr();
elementStr += " ";
......@@ -1288,7 +1288,7 @@ namespace Nektar
while(elementChild)
{
// Accumulate all non-comment element data
if (elementChild->Type() == TiXmlNode::TEXT)
if (elementChild->Type() == TiXmlNode::TINYXML_TEXT)
{
elementStr += elementChild->ToText()->ValueStr();
elementStr += " ";
......
......@@ -122,7 +122,7 @@ namespace Nektar
// ASSERTL0(indx == nextElementNumber, "Element IDs must begin with zero and be sequential.");
TiXmlNode* elementChild = segment->FirstChild();
while(elementChild && elementChild->Type() != TiXmlNode::TEXT)
while(elementChild && elementChild->Type() != TiXmlNode::TINYXML_TEXT)
{
elementChild = elementChild->NextSibling();
}
......@@ -198,7 +198,7 @@ namespace Nektar
// Comments appear as nodes just like elements.
// We are specifically looking for text in the body
// of the definition.
while(compositeChild && compositeChild->Type() != TiXmlNode::TEXT)
while(compositeChild && compositeChild->Type() != TiXmlNode::TINYXML_TEXT)
{
compositeChild = compositeChild->NextSibling();
}
......
......@@ -112,7 +112,7 @@ namespace Nektar
TiXmlElement *edge = field->FirstChildElement("E");
/// Since all edge data is one big text block, we need to
/// accumulate all TEXT data and then parse it. This
/// accumulate all TINYXML_TEXT data and then parse it. This
/// approach effectively skips all comments or other node
/// types since we only care about the edge list. We
/// cannot handle missing edge numbers as we could with
......@@ -138,7 +138,7 @@ namespace Nektar
TiXmlNode *child = edge->FirstChild();
edgeStr.clear();
if (child->Type() == TiXmlNode::TEXT)
if (child->Type() == TiXmlNode::TINYXML_TEXT)
{
edgeStr += child->ToText()->ValueStr();
}
......@@ -236,7 +236,7 @@ namespace Nektar
std::string elementStr;
while(elementChild)
{
if (elementChild->Type() == TiXmlNode::TEXT)
if (elementChild->Type() == TiXmlNode::TINYXML_TEXT)
{
elementStr += elementChild->ToText()->ValueStr();
}
......@@ -395,7 +395,7 @@ namespace Nektar
// Comments appear as nodes just like elements.
// We are specifically looking for text in the body
// of the definition.
while(compositeChild && compositeChild->Type() != TiXmlNode::TEXT)
while(compositeChild && compositeChild->Type() != TiXmlNode::TINYXML_TEXT)
{
compositeChild = compositeChild->NextSibling();
}
......
......@@ -113,7 +113,7 @@ namespace Nektar
TiXmlElement *edge = field->FirstChildElement("E");
/// Since all edge data is one big text block, we need to accumulate
/// all TEXT data and then parse it. This approach effectively skips
/// all TINYXML_TEXT data and then parse it. This approach effectively skips
/// all comments or other node types since we only care about the
/// edge list. We cannot handle missing edge numbers as we could
/// with missing element numbers due to the text block format.
......@@ -137,7 +137,7 @@ namespace Nektar
TiXmlNode *child = edge->FirstChild();
edgeStr.clear();
if (child->Type() == TiXmlNode::TEXT)
if (child->Type() == TiXmlNode::TINYXML_TEXT)
{
edgeStr += child->ToText()->ValueStr();
}
......@@ -223,7 +223,7 @@ namespace Nektar
std::string elementStr;
while(elementChild)
{
if (elementChild->Type() == TiXmlNode::TEXT)
if (elementChild->Type() == TiXmlNode::TINYXML_TEXT)
{
elementStr += elementChild->ToText()->ValueStr();
}
......@@ -376,7 +376,7 @@ namespace Nektar
std::string elementStr;
while(elementChild)
{
if (elementChild->Type() == TiXmlNode::TEXT)
if (elementChild->Type() == TiXmlNode::TINYXML_TEXT)
{
elementStr += elementChild->ToText()->ValueStr();
}
......@@ -669,7 +669,7 @@ namespace Nektar
// Comments appear as nodes just like elements.
// We are specifically looking for text in the body
// of the definition.
while(compositeChild && compositeChild->Type() != TiXmlNode::TEXT)
while(compositeChild && compositeChild->Type() != TiXmlNode::TINYXML_TEXT)
{
compositeChild = compositeChild->NextSibling();
}
......
......@@ -148,7 +148,7 @@ void ExpandVertices(TiXmlElement* mesh, map<int,int> jointVerts, map<int,int> &n
while (vertexBody)
{
// Accumulate all non-comment body data.
if (vertexBody->Type() == TiXmlNode::TEXT)
if (vertexBody->Type() == TiXmlNode::TINYXML_TEXT)
{
vertexBodyStr += vertexBody->ToText()->Value();
vertexBodyStr += " ";
......@@ -220,7 +220,7 @@ void ExpandEdges(TiXmlElement* mesh, map<int,int> &newVerts, map<int,int> jointE
TiXmlElement *edge = field->FirstChildElement("E");
/// Since all edge data is one big text block, we need to
/// accumulate all TEXT data and then parse it. This
/// accumulate all TINYXML_TEXT data and then parse it. This
/// approach effectively skips all comments or other node
/// types since we only care about the edge list. We
/// cannot handle missing edge numbers as we could with
......@@ -239,7 +239,7 @@ void ExpandEdges(TiXmlElement* mesh, map<int,int> &newVerts, map<int,int> jointE
TiXmlNode *child = edge->FirstChild();
edgeStr.clear();
if (child->Type() == TiXmlNode::TEXT)
if (child->Type() == TiXmlNode::TINYXML_TEXT)
{
edgeStr += child->ToText()->ValueStr();
}
......@@ -326,7 +326,7 @@ void ExpandElmts(TiXmlElement* mesh, map<int,int> &newEdges, int &nelmts)
std::string elementStr;
while(elementChild)
{
if (elementChild->Type() == TiXmlNode::TEXT)
if (elementChild->Type() == TiXmlNode::TINYXML_TEXT)
{
elementStr += elementChild->ToText()->ValueStr();
}
......@@ -494,7 +494,7 @@ void ExpandComposites(TiXmlElement * mesh, map<int,int> newEdges, int nOrigElmt
// Comments appear as nodes just like elements.
// We are specifically looking for text in the body
// of the definition.
while(compositeChild && compositeChild->Type() != TiXmlNode::TEXT)
while(compositeChild && compositeChild->Type() != TiXmlNode::TINYXML_TEXT)
{
compositeChild = compositeChild->NextSibling();
}
......
......@@ -3926,7 +3926,7 @@ cout<<"alpha="<<s_alp<<endl;
// Now read body of vertex
TiXmlNode *vertexBody = vertexnew->FirstChild();
// Accumulate all non-comment body data.
if (vertexBody->Type() == TiXmlNode::TEXT)
if (vertexBody->Type() == TiXmlNode::TINYXML_TEXT)
{
vertexBodyStr += vertexBody->ToText()->Value();
vertexBodyStr += " ";
......@@ -3996,7 +3996,7 @@ cout<<"alpha="<<s_alp<<endl;
std::string edgeBodyStr;
//read the body of the edge
TiXmlNode *edgeBody = edgenew->FirstChild();
if(edgeBody->Type() == TiXmlNode::TEXT)
if(edgeBody->Type() == TiXmlNode::TINYXML_TEXT)
{
edgeBodyStr += edgeBody->ToText()->Value();
edgeBodyStr += " ";
......
......@@ -482,7 +482,7 @@ void TurnOffEdges(TiXmlElement *doc,
// Comments appear as nodes just like elements.
// We are specifically looking for text in the body
// of the definition.
while(compositeChild && compositeChild->Type() != TiXmlNode::TEXT)
while(compositeChild && compositeChild->Type() != TiXmlNode::TINYXML_TEXT)
{
compositeChild = compositeChild->NextSibling();
}
......@@ -638,7 +638,7 @@ void RedefineVertices(TiXmlElement *doc,
while (vertexBody)
{
// Accumulate all non-comment body data.
if (vertexBody->Type() == TiXmlNode::TEXT)
if (vertexBody->Type() == TiXmlNode::TINYXML_TEXT)
{
vertexBodyStr += vertexBody->ToText()->Value();
vertexBodyStr += " ";
......
......@@ -38,7 +38,7 @@ TARGET_LINK_LIBRARIES(Tester
${Boost_THREAD_LIBRARY}
optimized ${TINYXML_LIBRARY} debug ${TINYXML_LIBRARY}
)
ADD_DEPENDENCIES(Tester boost tinyxml-2.4.3)
ADD_DEPENDENCIES(Tester boost tinyxml-2.6.2)
IF( ${CMAKE_SYSTEM} MATCHES "Linux.*")
TARGET_LINK_LIBRARIES(Tester optimized rt debug rt)
......
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