Skip to content

Commit 122fd23

Browse files
authored
grass_proj: use OSRIsSame to compare CRSs (#6579)
Use newer OSRIsSame() from the OGR SRS API replacing the old G_compare_projections() in GRASS from PROJ4 times.
1 parent e8dd430 commit 122fd23

File tree

23 files changed

+968
-1188
lines changed

23 files changed

+968
-1188
lines changed

raster/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ build_program_in_subdir(
220220
grass_gproj
221221
${LIBM}
222222
PRIMARY_DEPENDS
223+
PROJ::proj
223224
GDAL::GDAL)
224225

225226
build_program_in_subdir(r.external.out DEPENDS grass_gis grass_raster grass_gproj
@@ -271,6 +272,7 @@ build_program_in_subdir(
271272
grass_imagery
272273
${LIBM}
273274
PRIMARY_DEPENDS
275+
PROJ::proj
274276
GDAL::GDAL)
275277

276278
build_program_in_subdir(r.in.gridatb DEPENDS grass_gis grass_raster)

raster/r.external/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
22

33
PGM = r.external
44

5-
LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB) $(GDALLIBS) $(MATHLIB) $(IMAGERYLIB)
5+
LIBES = $(GPROJLIB) $(RASTERLIB) $(GISLIB) $(GDALLIBS) $(MATHLIB) $(IMAGERYLIB) $(PROJLIB)
66
DEPENDENCIES = $(GPROJDEP) $(RASTERDEP) $(GISDEP) $(IMAGERYDEP)
77
EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
88

0 commit comments

Comments
 (0)