Package: magics++ / 4.5.3-1

terralib.patch Patch series | download
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
41
42
43
44
45
46
47
48
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Add Debian's libterralib, rather than built-in version
Last-Updated: 2017-12-27
Forwarded: not-needed

Index: magics++-4.5.0/src/CMakeLists.txt
===================================================================
--- magics++-4.5.0.orig/src/CMakeLists.txt
+++ magics++-4.5.0/src/CMakeLists.txt
@@ -68,7 +68,6 @@ add_subdirectory( web )
 add_subdirectory( visualisers )
 add_subdirectory( drivers )
 add_subdirectory( decoders )
-add_subdirectory( terralib )
 add_subdirectory( clipper )
 add_subdirectory( eckit_readers )
 
@@ -95,7 +94,6 @@ ecbuild_add_library( TARGET    MagPlus
                         ${qt_srcs}
                         ${decoders_srcs}
                         ${clipper_srcs}
-                        ${terralib_srcs}
                         ${odb_srcs}
                      TEMPLATES
                         ${common_templates}
@@ -116,7 +114,6 @@ ecbuild_add_library( TARGET    MagPlus
                                      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/drivers>
                                      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/decoders>
                                      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/visualisers>
-                                     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/terralib/kernel>
                                      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/eckit_readers>
                                      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/web>
                                      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/drivers/MgQ>
@@ -188,14 +185,6 @@ if( metview )
      list(APPEND attributes_include QtDriverAttributes.h)
    endif()
 
-   install( FILES terralib/kernel/TeProjection.h
-		  terralib/kernel/TeCoord2D.h
-		  terralib/kernel/TeDefines.h
-		  terralib/kernel/TePrecision.h
-		  terralib/kernel/TeSingleton.h
-		  terralib/kernel/TeDatum.h
-		  terralib/kernel/TeUtils.h
-		  DESTINATION ${INSTALL_INCLUDE_DIR})
 
    install( FILES AutoVector.h       DESTINATION ${INSTALL_INCLUDE_DIR})
    install( FILES Iterable.h         DESTINATION ${INSTALL_INCLUDE_DIR})