Revert "Merge pull request #102 from mariokonrad/upstream-tinyxml"

This reverts commit 27b4d4c, reversing changes made to 3381e7a.
OpenCPN · Mar 5, 2014 · b1f1630 · b1f1630 · bdbcat · Mar 5, 2014
1 parent 906e82f
commit b1f1630
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 530 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,16 +31,14 @@
 # set /MT for Release build, and /MTd for debug.
 
 # define minimum cmake version
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
 # This should be 2.8.0 to have FindGTK2 module
 IF (COMMAND cmake_policy)
   CMAKE_POLICY(SET CMP0003 OLD)
   CMAKE_POLICY(SET CMP0005 OLD)
   CMAKE_POLICY(SET CMP0011 OLD)
 ENDIF (COMMAND cmake_policy)
 
-INCLUDE(ExternalProject)
-
 PROJECT(OpenCPN)
 
 #SET(CMAKE_VERBOSE_MAKEFILE ON)
@@ -529,6 +527,13 @@ ENDIF(wx_Version MATCHES "2.9")
 
 SET( PACKAGE_HEADERS "" )
 
+SET(SRC_TINYXML
+            src/tinyxml.cpp
+            src/tinyxmlerror.cpp
+            src/tinyxmlparser.cpp
+            include/tinyxml.h
+      )
+
 IF(OPENGL_GLU_FOUND)
   SET(HDRS ${HDRS} include/glChartCanvas.h
                    include/glTextureDescriptor.h
@@ -545,9 +550,8 @@ IF(TINYXML_FOUND)
     ADD_DEFINITIONS(-DTIXML_USE_STL)
 ELSE(TINYXML_FOUND)
     message (STATUS "tinyxml library not found")
-    INCLUDE(ExternTinyXML)
-    SET(EXTRA_LIBS ${EXTRA_LIBS} tinyxml)
-    INCLUDE_DIRECTORIES("${tinyxml_INCLUDE_DIR}/tinyxml")
+    SET(SRCS ${SRCS} ${SRC_TINYXML})
+    ADD_DEFINITIONS(-DTIXML_USE_STL)
 ENDIF(TINYXML_FOUND)
 
 
@@ -636,9 +640,6 @@ IF (USE_S57)
 		src/mygdal/gdal_misc.cpp
 	)
 	ADD_LIBRARY(S57ENC ${SRC_S57ENC})
-	IF(NOT TINYXML_FOUND)
-		ADD_DEPENDENCIES(S57ENC tinyxml)
-	ENDIF()
 	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/mygdal)
 	SET(EXTRA_LIBS ${EXTRA_LIBS} S57ENC)
 ELSE (USE_S57)
@@ -697,9 +698,6 @@ IF (USE_GARMINHOST)
         ENDIF(WIN32)
 
 	ADD_LIBRARY(GARMINHOST ${SRC_GARMINHOST})
-	IF(NOT TINYXML_FOUND)
-		ADD_DEPENDENCIES(GARMINHOST tinyxml)
-	ENDIF(NOT TINYXML_FOUND)
 	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/garmin/jeeps)
 	SET(EXTRA_LIBS ${EXTRA_LIBS} GARMINHOST)
         IF(WIN32)

diff --git a/ExternTinyXML.cmake b/ExternTinyXML.cmake
diff --git a/include/navutil.h b/include/navutil.h
@@ -43,6 +43,7 @@
 
 #include "bbox.h"
 #include "chcanv.h"
+#include "tinyxml.h"
 #include "chartdbs.h"
 #include "RoutePoint.h"
 #include "vector2D.h"

diff --git a/include/styles.h b/include/styles.h
@@ -25,6 +25,7 @@
  **************************************************************************/
 
 #pragma once
+#include <tinyxml.h>
 
 #include "ocpn_types.h"
 

diff --git a/src_extern/tinyxml-2.6.2/tinyxml.h → include/tinyxml.h b/src_extern/tinyxml-2.6.2/tinyxml.h → include/tinyxml.h
diff --git a/src/styles.cpp b/src/styles.cpp
@@ -32,7 +32,6 @@
 #include <wx/filename.h>
 #include <wx/dir.h>
 #include <stdlib.h>
-#include <tinyxml.h>
 
 #include "styles.h"
 #include "chart1.h"

diff --git a/src_extern/tinyxml-2.6.2/tinyxml.cpp → src/tinyxml.cpp b/src_extern/tinyxml-2.6.2/tinyxml.cpp → src/tinyxml.cpp
diff --git a/src_extern/tinyxml-2.6.2/tinyxmlerror.cpp → src/tinyxmlerror.cpp b/src_extern/tinyxml-2.6.2/tinyxmlerror.cpp → src/tinyxmlerror.cpp
diff --git a/src_extern/tinyxml-2.6.2/tinyxmlparser.cpp → src/tinyxmlparser.cpp b/src_extern/tinyxml-2.6.2/tinyxmlparser.cpp → src/tinyxmlparser.cpp
diff --git a/src/undo.cpp b/src/undo.cpp
@@ -42,6 +42,7 @@
 #include "routeman.h"
 #include "routeprop.h"
 #include "routemanagerdialog.h"
+#include "tinyxml.h"
 #include "undo.h"
 #include "chcanv.h"
 

diff --git a/src_extern/README.md b/src_extern/README.md
diff --git a/src_extern/tinyxml-2.6.2/CMakeLists.txt b/src_extern/tinyxml-2.6.2/CMakeLists.txt
diff --git a/src_extern/tinyxml-2.6.2/tinystr.cpp b/src_extern/tinyxml-2.6.2/tinystr.cpp