[vtk6] 06/12: d/control: Enable system LIBPROJ4

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository vtk6.

commit ce3f3ad0dafb055fdff350bcc34d4d6337c30699
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sun Mar 27 10:38:07 2016 +0000

    d/control: Enable system LIBPROJ4
---
 CMake/FindLIBPROJ4.cmake                         |  5 ++++-
 debian/patches/102_enable_system_proj4_lib.patch | 23 +++++++++++++++++++----
 debian/rules                                     |  1 +
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/CMake/FindLIBPROJ4.cmake b/CMake/FindLIBPROJ4.cmake
index 9d3904d..e37bce2 100644
--- a/CMake/FindLIBPROJ4.cmake
+++ b/CMake/FindLIBPROJ4.cmake
@@ -24,9 +24,10 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES OR NOT LIBPROJ4_FOUND )
       ${CMAKE_INSTALL_PREFIX}/lib
       /usr/local/lib
       /usr/lib
-    NO_DEFAULT_PATH
   )
 
+  MESSAGE(STATUS  "LIBPROJ4_LIBRARIES=${LIBPROJ4_LIBRARIES}")
+
   find_path( LIBPROJ4_INCLUDE_DIR
     NAMES proj_api.h
     PATHS
@@ -40,6 +41,8 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES OR NOT LIBPROJ4_FOUND )
     NO_DEFAULT_PATH
   )
 
+  MESSAGE(STATUS  "LIBPROJ4_INCLUDE_DIR=${LIBPROJ4_INCLUDE_DIR}")
+
   if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES )
     if ( LIBPROJ4_REQUIRED )
       message( FATAL_ERROR "LIBPROJ4 is required. Set LIBPROJ4_DIR" )
diff --git a/debian/patches/102_enable_system_proj4_lib.patch b/debian/patches/102_enable_system_proj4_lib.patch
index e152dc2..27cb456 100644
--- a/debian/patches/102_enable_system_proj4_lib.patch
+++ b/debian/patches/102_enable_system_proj4_lib.patch
@@ -5,9 +5,9 @@ Upstream-Bug: http://www.vtk.org/Bug/view.php?id=14126
 
 Index: vtk6-6.2.0+dfsg1/CMake/FindLIBPROJ4.cmake
 ===================================================================
---- vtk6-6.2.0+dfsg1.orig/CMake/FindLIBPROJ4.cmake
-+++ vtk6-6.2.0+dfsg1/CMake/FindLIBPROJ4.cmake
-@@ -12,7 +12,7 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIB
+--- a/CMake/FindLIBPROJ4.cmake
++++ b/CMake/FindLIBPROJ4.cmake
+@@ -12,7 +12,7 @@
    endif ()
  
    find_library( LIBPROJ4_LIBRARIES
@@ -16,15 +16,30 @@ Index: vtk6-6.2.0+dfsg1/CMake/FindLIBPROJ4.cmake
      PATHS
        ${_LIBPROJ4_DIR}/lib64
        ${CMAKE_INSTALL_PREFIX}/lib64
-@@ -28,7 +28,7 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIB
+@@ -24,11 +24,12 @@
+       ${CMAKE_INSTALL_PREFIX}/lib
+       /usr/local/lib
+       /usr/lib
+-    NO_DEFAULT_PATH
    )
  
++  MESSAGE(STATUS  "LIBPROJ4_LIBRARIES=${LIBPROJ4_LIBRARIES}")
++
    find_path( LIBPROJ4_INCLUDE_DIR
 -    NAMES lib_proj.h
 +    NAMES proj_api.h
      PATHS
        ${_LIBPROJ4_DIR}
        ${_LIBPROJ4_DIR}/include
+@@ -40,6 +41,8 @@
+     NO_DEFAULT_PATH
+   )
+ 
++  MESSAGE(STATUS  "LIBPROJ4_INCLUDE_DIR=${LIBPROJ4_INCLUDE_DIR}")
++
+   if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES )
+     if ( LIBPROJ4_REQUIRED )
+       message( FATAL_ERROR "LIBPROJ4 is required. Set LIBPROJ4_DIR" )
 Index: vtk6-6.2.0+dfsg1/Geovis/Core/vtkGeoProjection.cxx
 ===================================================================
 --- vtk6-6.2.0+dfsg1.orig/Geovis/Core/vtkGeoProjection.cxx
diff --git a/debian/rules b/debian/rules
index 1acb142..c0d28d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ extra_flags +=  \
 	-DVTK_USE_SYSTEM_GL2PS=ON \
 	-DVTK_USE_SYSTEM_HDF5=ON \
 	-DVTK_USE_SYSTEM_JPEG=ON \
+	-DVTK_USE_SYSTEM_LIBPROJ4=ON \
 	-DVTK_USE_SYSTEM_LIBXML2=ON \
 	-DVTK_USE_SYSTEM_OGGTHEORA=ON \
 	-DVTK_USE_SYSTEM_PNG=ON \

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