File: 102_enable_system_proj4_lib.patch

package info (click to toggle)
vtk7 7.1.1%2Bdfsg2-8
  • links: PTS, VCS
  • area: main
  • in suites: bullseye
  • size: 127,396 kB
  • sloc: cpp: 1,539,584; ansic: 124,382; python: 78,038; tcl: 47,013; xml: 8,142; yacc: 5,040; java: 4,439; perl: 3,132; lex: 1,926; sh: 1,500; makefile: 126; objc: 83
file content (40 lines) | stat: -rw-r--r-- 1,062 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
Description: Correct code to enable use of system proj4 
Author: Matthew Woehlke <matthew.woehlke@kitware.com>
Bug: https://bugs.debian.org/750184
Upstream-Bug: http://www.vtk.org/Bug/view.php?id=14126

--- a/CMake/FindLIBPROJ4.cmake
+++ b/CMake/FindLIBPROJ4.cmake
@@ -12,7 +12,7 @@
   endif ()
 
   find_library( LIBPROJ4_LIBRARIES
-    NAMES proj4 libproj4
+    NAMES proj
     PATHS
       ${_LIBPROJ4_DIR}/lib64
       ${CMAKE_INSTALL_PREFIX}/lib64
@@ -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" )