Merge pull request #85 from kalibera/winlink-pkgconf

Use pkg-config on Windows when available.
r-spatial · Feb 9, 2024 · e7467e5 · e7467e5
2 parents a95440a + dc2ab15
commit e7467e5
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
@@ -73,6 +73,9 @@ OBJECTS_LIBLWGEOM= \
   liblwgeom/lwin_wkt_parse.o
 
 PKG_CPPFLAGS = -I./liblwgeom -DUSE_PROJ_H
+PKG_LIBS = -L./liblwgeom -llwgeomstatic
+
+ifeq (,$(shell pkg-config --version 2>/dev/null))
 
 #PKG_LIBS =  \
 #	-L./liblwgeom -llwgeomstatic \
@@ -81,11 +84,13 @@ PKG_CPPFLAGS = -I./liblwgeom -DUSE_PROJ_H
 #	-lcrypto -lws2_32 -ltiff -llzma -ljpeg -lz -lgeotiff -ltiff -lproj -lgeotiff -ltiff -lcurl \
 #	-lsqlite3 -lcrypt32 -lwldap32
 
-LIBSHARPYUV = $(or $(and $(wildcard $(R_TOOLS_SOFT)/lib/libsharpyuv.a),-lsharpyuv),)
+  LIBSHARPYUV = $(or $(and $(wildcard $(R_TOOLS_SOFT)/lib/libsharpyuv.a),-lsharpyuv),)
 
-PKG_LIBS =  \
-	-L./liblwgeom -llwgeomstatic \
--fopenmp -lgdal -larmadillo -lopenblas -lgfortran -lquadmath -lpq -lpgcommon -lpgport -lodbc32 -lodbccp32 -lblosc -lkea -lhdf5_cpp -lhdf5 -lpoppler -llcms2 -lfreetype -lharfbuzz -lfreetype -llz4 -lpcre2-8 -lxml2 -lopenjp2 -lnetcdf -lmysqlclient -lspatialite -lgeos_c -lgeos -lminizip -lgeos -ljson-c -lgta -lfreexl -lexpat -lssl -lpsapi -lgif -lmfhdf -lhdf5_hl -lcrypto -lportablexdr -ldf -lhdf5 -lsz -lpng16 -lpng -lpoppler -llcms2 -lfreetype -lharfbuzz -lfreetype -llz4 -lpcre2-8 -lpcre -lproj -lcurl -lbcrypt -lrtmp -lssl -lssh2 -lidn2 -lunistring -liconv -lgcrypt -lcrypto -lgpg-error -lws2_32 -ltiff -llzma -ljpeg -lz -lcfitsio -lzstd -lwebpdecoder -lwebp $(LIBSHARPYUV) -lsbml-static -lgeotiff -lsqlite3 -lbz2 -lcrypt32 -lwldap32 -lsecur32
+  PKG_LIBS +=  \
+-fopenmp -lgdal -larmadillo -lopenblas -lgfortran -lquadmath -lpq -lpgcommon -lpgport -lodbc32 -lodbccp32 -lblosc -lkea -lhdf5_cpp -lhdf5 -lpoppler -llcms2 -lfreetype -lharfbuzz -lfreetype -llz4 -lpcre2-8 -lxml2 -lopenjp2 -lnetcdf -lmysqlclient -lspatialite -lgeos_c -lgeos -lminizip -lgeos -ljson-c -lgta -lfreexl -lexpat -lssl -lpsapi -lgif -lmfhdf -lhdf5_hl -lcrypto -lportablexdr -ldf -lhdf5 -lsz -lpng16 -lpng -lpoppler -llcms2 -lfreetype -lharfbuzz -lfreetype -llz4 -lpcre2-8 -lpcre -lcurl -lbcrypt -lrtmp -lssl -lssh2 -lidn2 -lunistring -liconv -lgcrypt -lcrypto -lgpg-error -lws2_32 -ltiff -llzma -ljpeg -lz -lcfitsio -lzstd -lwebpdecoder -lwebp $(LIBSHARPYUV) -lsbml-static -lgeotiff -lproj -lsqlite3 -lbz2 -lcrypt32 -lwldap32 -lsecur32
+else
+  PKG_LIBS += $(shell pkg-config --libs geos proj)
+endif
 
 all: clean winlibs