mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
Added compilation and linking flags for the GEOS library.
git-svn-id: http://svn.osgeo.org/qgis/trunk@2226 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
63b8c9679f
commit
d72782bd99
@ -13,8 +13,8 @@ delimitedtextprovider_la_SOURCES = qgsdelimitedtextprovider.cpp \
|
|||||||
../../src/qgsfield.cpp
|
../../src/qgsfield.cpp
|
||||||
|
|
||||||
|
|
||||||
delimitedtextprovider_la_LIBADD = $(QT_LDADD) $(GDAL_LIB)
|
delimitedtextprovider_la_LIBADD = $(QT_LDADD) $(GDAL_LIB) $(GEOS_LDADD)
|
||||||
delimitedtextprovider_la_LDFLAGS = -avoid-version -module
|
delimitedtextprovider_la_LDFLAGS = -avoid-version -module
|
||||||
delimitedtextprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS)
|
delimitedtextprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
|
||||||
|
|
||||||
EXTRA_DIST = qgsdelimitedtextprovider.h
|
EXTRA_DIST = qgsdelimitedtextprovider.h
|
||||||
|
@ -14,8 +14,8 @@ gpxprovider_la_SOURCES = qgsgpxprovider.cpp \
|
|||||||
../../src/qgsfield.cpp
|
../../src/qgsfield.cpp
|
||||||
|
|
||||||
|
|
||||||
gpxprovider_la_LIBADD = $(QT_LDADD)
|
gpxprovider_la_LIBADD = $(QT_LDADD) $(GEOS_LDADD)
|
||||||
gpxprovider_la_LDFLAGS = -avoid-version -module
|
gpxprovider_la_LDFLAGS = -avoid-version -module
|
||||||
gpxprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS)
|
gpxprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
|
||||||
|
|
||||||
EXTRA_DIST = qgsgpxprovider.h gpsdata.h
|
EXTRA_DIST = qgsgpxprovider.h gpsdata.h
|
||||||
|
@ -12,6 +12,6 @@ postgresprovider_la_SOURCES = qgspostgresprovider.cpp \
|
|||||||
../../src/qgspoint.cpp \
|
../../src/qgspoint.cpp \
|
||||||
../../src/qgsfield.cpp
|
../../src/qgsfield.cpp
|
||||||
|
|
||||||
postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB)
|
postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GEOS_LDADD)
|
||||||
postgresprovider_la_LDFLAGS = -avoid-version -module
|
postgresprovider_la_LDFLAGS = -avoid-version -module
|
||||||
postgresprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(PG_INC) $(DEBUG_QGIS)
|
postgresprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user