File: zip.patch

package info (click to toggle)
eckit 1.32.4-1
  • links: PTS
  • area: main
  • in suites:
  • size: 305,880 kB
  • sloc: cpp: 111,654; ansic: 2,826; yacc: 590; lex: 361; python: 237; sh: 202; makefile: 41
file content (33 lines) | stat: -rw-r--r-- 1,185 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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,7 +150,7 @@
 
 ecbuild_add_option( FEATURE ZIP
                     DESCRIPTION "ZIP support for compression"
-                    REQUIRED_PACKAGES libzip )
+                    REQUIRED_PACKAGES zip )
 
 ### Hashing options
 
@@ -226,8 +226,8 @@
                     DESCRIPTION "eckit::geo geometry library support for shapefiles" )
 
 if( eckit_HAVE_GEO_AREA_SHAPEFILE )
-    if( NOT TARGET shapelib::shp OR NOT TARGET libzip::zip )
-        message( FATAL_ERROR "eckit::geo geometry library support for shapefiles requires the shapelib::shp and libzip::zip libraries" )
+    if( NOT TARGET shapelib::shp OR NOT TARGET zip::zip )
+        message( FATAL_ERROR "eckit::geo geometry library support for shapefiles requires the shapelib::shp and zip::zip libraries" )
     endif()
 endif()
 
--- a/src/eckit/geo/CMakeLists.txt
+++ b/src/eckit/geo/CMakeLists.txt
@@ -222,7 +222,7 @@
         cache/Unzip.cc
         cache/Unzip.h
     )
-    list(APPEND eckit_geo_libs shapelib::shp libzip::zip)
+    list(APPEND eckit_geo_libs shapelib::shp zip::zip)
 endif()
 
 string(REPLACE ";" ":" eckit_GEO_SHARE_GRID "${eckit_GEO_SHARE_GRID}")