r3029 - in packages/opencpn/trunk/debian: . cmake_Modules

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2011-06-30 02:06:22 +0000 (Thu, 30 Jun 2011)
New Revision: 3029

Added:
   packages/opencpn/trunk/debian/cmake_Modules/
   packages/opencpn/trunk/debian/cmake_Modules/FindTinyXML.cmake
Modified:
   packages/opencpn/trunk/debian/copyright
   packages/opencpn/trunk/debian/rules
Log:
more tinyxml cmake bits, enable debhelper --parallel

Added: packages/opencpn/trunk/debian/cmake_Modules/FindTinyXML.cmake
===================================================================
--- packages/opencpn/trunk/debian/cmake_Modules/FindTinyXML.cmake	                        (rev 0)
+++ packages/opencpn/trunk/debian/cmake_Modules/FindTinyXML.cmake	2011-06-30 02:06:22 UTC (rev 3029)
@@ -0,0 +1,26 @@
+# - Find TinyXML
+# Find the native TinyXML includes and library
+#
+#   TINYXML_FOUND       - True if TinyXML found.
+#   TINYXML_INCLUDE_DIR - where to find tinyxml.h, etc.
+#   TINYXML_LIBRARIES   - List of libraries when using TinyXML.
+#
+
+IF( TINYXML_INCLUDE_DIR )
+    # Already in cache, be silent
+    SET( TinyXML_FIND_QUIETLY TRUE )
+ENDIF( TINYXML_INCLUDE_DIR )
+
+FIND_PATH( TINYXML_INCLUDE_DIR "tinyxml.h"
+           PATH_SUFFIXES "tinyxml" )
+
+FIND_LIBRARY( TINYXML_LIBRARIES
+              NAMES "tinyxml"
+              PATH_SUFFIXES "tinyxml" )
+
+# handle the QUIETLY and REQUIRED arguments and set TINYXML_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE( "FindPackageHandleStandardArgs" )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( "TinyXML" DEFAULT_MSG TINYXML_INCLUDE_DIR TINYXML_LIBRARIES )
+
+MARK_AS_ADVANCED( TINYXML_INCLUDE_DIR TINYXML_LIBRARIES )

Modified: packages/opencpn/trunk/debian/copyright
===================================================================
--- packages/opencpn/trunk/debian/copyright	2011-06-29 10:51:53 UTC (rev 3028)
+++ packages/opencpn/trunk/debian/copyright	2011-06-30 02:06:22 UTC (rev 3029)
@@ -41,3 +41,6 @@
     Copyright (C) 2010-2011 Anton Martchukov <anton at martchukov.com>,
     and the DebianGIS team.
 
+The FindTinyXML.cmake file in the Debian packaging is (c) 2006-2008 The EVEmu
+Team, GPL>=2.   http://trac.evemu.org
+

Modified: packages/opencpn/trunk/debian/rules
===================================================================
--- packages/opencpn/trunk/debian/rules	2011-06-29 10:51:53 UTC (rev 3028)
+++ packages/opencpn/trunk/debian/rules	2011-06-30 02:06:22 UTC (rev 3029)
@@ -11,9 +11,10 @@
 CXXFLAGS=-Wall -O3
 
 %:
-	dh  $@
+	dh $@ --parallel
 
 override_dh_auto_configure:
+	cp -f $(CURDIR)/debian/cmake_Modules/FindTinyXML.cmake $(CURDIR)/
 	# Remove embedded stuff which will go unused
 	rm -rf $(CURDIR)/plugins/grib_pi/src/zlib-1.2.3/
 	rm -rf $(CURDIR)/plugins/grib_pi/src/bzip2/