[magics] 02/03: Add additional dirs to cmake include path

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository magics.

commit 5e1cb96973f52c29f488f5ec97dfa5bcc3c8e1bb
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jan 10 05:41:03 2016 +0000

    Add additional dirs to cmake include path
---
 debian/control                    | 2 +-
 debian/patches/cmake-config.patch | 4 ++--
 debian/patches/series             | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index f2705be..c5c54f5 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper  (>= 9) , dh-buildinfo, gfortran, cmake, chrpath,
  libjasper-dev, libcairo2-dev, libpango1.0-dev,
  ttf-dejavu-core, libxml-parser-perl, 
  libopenjpeg-dev, ghostscript, zlib1g-dev, libboost-dev, libproj-dev, 
- qtbase5-dev-tools, qtbase5-dev, qt5-qmake, qt-chooser
+ qtbase5-dev-tools, qtbase5-dev, qt5-qmake
 Standards-Version: 3.9.6
 Homepage: https://software.ecmwf.int/wiki/display/MAGP/Magics
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/magics.git
diff --git a/debian/patches/cmake-config.patch b/debian/patches/cmake-config.patch
index 89cbf54..bc67fa6 100644
--- a/debian/patches/cmake-config.patch
+++ b/debian/patches/cmake-config.patch
@@ -1,6 +1,6 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Ensure /usr/include/magics on include path in Metview
-Last-Updated: 2015-07-21
+Last-Updated: 2016-01-09
 Forwarded: not-needed
 
 Index: magics++-2.26.2/cmake/project-config.cmake.in
@@ -12,7 +12,7 @@ Index: magics++-2.26.2/cmake/project-config.cmake.in
  get_filename_component(@PNAME at _CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
  
 -set( @PNAME at _SELF_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@" )
-+set( MAGICS_SELF_INCLUDE_DIRS "/usr/include/magics" )
++set( MAGICS_SELF_INCLUDE_DIRS "/usr/include/magics;/usr/include/terralib;/usr/include/terralib/kernel" )
  set( @PNAME at _SELF_DEFINITIONS  "@CONF_DEFINITIONS@" )
  set( @PNAME at _SELF_LIBRARIES    "@CONF_LIBRARIES@" )
  
diff --git a/debian/patches/series b/debian/patches/series
index bbd0d49..10e68fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ soname-version.patch
 reproducibility.patch
 compile-fixes.patch
 pkgconfig-fix.patch
+cmake-config.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git