[gentoo-commits] gentoo-x86 commit in sci-geosciences/opencpn/files: opencpn-2.5.0_tinyxml_stl.patch

[Marc Schiffbauer (mschiff)]

mschiff     11/09/28 14:39:18

  Added:                opencpn-2.5.0_tinyxml_stl.patch
  Log:
  Add patch to fix linking against tinyxml[stl]. Fixes #384781
  
  (Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/opencpn/files/opencpn-2.5.0_tinyxml_stl.patch?rev=1.1&content-type=text/plain

Index: opencpn-2.5.0_tinyxml_stl.patch
===================================================================
--- OpenCPN-2.5.0-Source/CMakeLists.txt	2011-07-26 16:51:59.000000000 +0200
+++ opencpn/CMakeLists.txt	2011-09-28 16:28:35.181651034 +0200
@@ -325,9 +325,12 @@
       )
 
 IF(TINYXML_FOUND)
+    message (STATUS "Building with tinyxml includes")
     INCLUDE_DIRECTORIES(${TINYXML_INCLUDE_DIR})
+    ADD_DEFINITIONS(-DTIXML_USE_STL)
 ELSE(TINYXML_FOUND)
-  SET(SRCS ${SRCS} ${SRC_TINYXML})
+    message (STATUS "tinyxml library not found")
+    SET(SRCS ${SRCS} ${SRC_TINYXML})
 ENDIF(TINYXML_FOUND)