[otb] 01/02: Build against Debian packaged libtinyxml (thanks for the hint to Rashad M <mohammedrashadkm at gmail.com>)

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository otb.

commit e899decfa1278316ac1e8071dc85c42c689e9914
Author: Andreas Tille <tille at debian.org>
Date:   Tue Oct 7 21:20:23 2014 +0200

    Build against Debian packaged libtinyxml (thanks for the hint to Rashad M <mohammedrashadkm at gmail.com>)
---
 debian/changelog | 2 ++
 debian/control   | 3 ++-
 debian/rules     | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee09f82..4820bc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ otb (4.2.1-1) UNRELEASED; urgency=medium
   * DEP5 compatible copyright file
   * debian/control: There is no point to have the package in contrib
   * delete unused post{inst,rm} files
+  * Build against Debian packaged libtinyxml (thanks for the hint to
+    Rashad M <mohammedrashadkm at gmail.com>)
 
   [ Paolo Cavallini ]
   * New upstream release.
diff --git a/debian/control b/debian/control
index c78ff6b..5a8cb3e 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,8 @@ Build-Depends: debhelper (>= 9),
                libmuparser-dev,
                libopencv-dev,
                libossim-dev,
-               libfftw3-dev
+               libfftw3-dev,
+               libtinyxml-dev
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/otb.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/otb.git
diff --git a/debian/rules b/debian/rules
index 188f2e1..6796c3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,8 @@ CMAKE_FLAGS = \
 	-DBUILD_EXAMPLES:BOOL=OFF \
 	-DBUILD_TESTING:BOOL=OFF \
 	-DOTB_WRAP_QT:BOOL=ON \
-	-DOTB_WRAP_PYTHON:BOOL=ON
+	-DOTB_WRAP_PYTHON:BOOL=ON \
+	-DOTB_USE_EXTERNAL_TINYXML:BOOL=ON
 
 pkgcli:=otb-bin
 pkggui:=otb-bin-qt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git