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
|
Index: eckit-1.33.0/CMakeLists.txt
===================================================================
--- eckit-1.33.0.orig/CMakeLists.txt
+++ eckit-1.33.0/CMakeLists.txt
@@ -150,7 +150,7 @@ ecbuild_add_option( FEATURE AEC
ecbuild_add_option( FEATURE ZIP
DESCRIPTION "ZIP support for compression"
- REQUIRED_PACKAGES libzip )
+ REQUIRED_PACKAGES zip )
### Hashing options
@@ -222,8 +222,8 @@ if( eckit_HAVE_ECKIT_CODEC AND eckit_HAV
endif()
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()
Index: eckit-1.33.0/src/eckit/geo/CMakeLists.txt
===================================================================
--- eckit-1.33.0.orig/src/eckit/geo/CMakeLists.txt
+++ eckit-1.33.0/src/eckit/geo/CMakeLists.txt
@@ -204,7 +204,7 @@ if(eckit_HAVE_GEO_AREA_SHAPEFILE)
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}")
|
