Skip to content

Commit df4430b

Browse files
author
timlinux
committed
updates to build system:
- build delimited text plugins.pro - set the plugin install path in the settings file - initial work on grass pro but disabled for now until I get grass in msys git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5996 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent baedebb commit df4430b

File tree

5 files changed

+42
-27
lines changed

5 files changed

+42
-27
lines changed

settings.pro

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ linux-g++:QGISLIBDIR=$${DESTDIR}/lib
9898
macx:QGISLIBDIR=$${QGISBINDIR}
9999
win32:QGISLIBDIR=$${DESTDIR}
100100

101-
QGISPLUGINDIR=$${QGISBINDIR}/plugins
102-
macx:QGISPLUGINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/plugins
101+
QGISPLUGINDIR=$${DESTDIR}/lib/qgis
102+
macx:QGISPLUGINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
103103

104104
QGISPROVIDERDIR=$${QGISBINDIR}/lib/qgis
105105
macx:QGISPROVIDERDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
@@ -145,6 +145,7 @@ macx:GDALLIBADD=-framework gdal
145145
SQLITELIBADD=-lsqlite3
146146
PROJLIBADD=-lproj
147147
GEOSLIBADD=-lgeos
148+
GRASSLIBADD=-lgrass
148149

149150
win32:LIBS += -lWs2_32
150151

@@ -231,4 +232,3 @@ linux-g++:OBJECTS_DIR = $${OBJDIR}/o/linux
231232
win32:OBJECTS_DIR = $${OBJDIR}/o/win32
232233
#These next two are not currently needed for this simple project
233234
#RCC_DIR = $${OBJDIR}/rcc
234-
#RC_FILE = $${APPNAME}.rc
+33-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,39 @@
1-
####################################################################
2-
# Qmake project file for QGIS top-level plugins directory
3-
# This file is used by qmake to generate the Makefiles for building
4-
# QGIS plugins on Windows
1+
#################################################################
52
#
6-
# delimited_text.pro,v 1.1 2004/06/23 04:15:54 gsherman Exp
7-
####################################################################
3+
# QMAKE Project File for Quantum GIS
4+
#
5+
# Tim Sutton 2006
6+
#
7+
# NOTE: Do not place any hard coded external paths in this file
8+
# all libs and includes should be specified in settings.pro
9+
# in the top level qgis directory.
10+
#
11+
#################################################################
12+
13+
#
14+
# This file builds the gui library - the app is built in a separate pro file
15+
#
16+
17+
include(../../../settings.pro)
18+
TARGET=delimitedtextprovider
819
TEMPLATE = lib
9-
INCLUDEPATH += . ..\..\src $(GDAL)\include
10-
LIBS += $(GDAL)\lib\gdal_i.lib
11-
DLLDESTDIR= ..\..\win_build\lib\qgis
12-
CONFIG += qt dll thread
13-
# Input
20+
#suffix debug to target if applicable
21+
CONFIG(debug, debug|release){
22+
TARGET = $$member(TARGET, 0)-debug
23+
}
24+
LIBS += $${GDALLIBADD}
25+
#LIBS += $${GEOSLIBADD}
26+
#LIBS += $${PROJLIBADD}
27+
LIBS += $${QGISCORELIBADD}
28+
LIBS += $${QGISGUILIBADD}
29+
#LIBS += $${QGISPROJECTIONSELECTORLIBADD}
30+
DESTDIR=$${QGISPLUGINDIR}
31+
QT += qt3support svg core gui xml network
32+
message("Building libs into $${DESTDIR}")
33+
34+
CONFIG += qt dll thread debug rtti
1435
HEADERS += qgsdelimitedtextplugin.h \
1536
qgsdelimitedtextplugingui.h
16-
INTERFACES += qgsdelimitedtextpluginguibase.ui
37+
FORMS += qgsdelimitedtextpluginguibase.ui
1738
SOURCES += qgsdelimitedtextplugin.cpp \
1839
qgsdelimitedtextplugingui.cpp

src/plugins/plugins.pro

+4-11
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,10 @@
77
####################################################################
88

99
TEMPLATE = subdirs
10-
SUBDIRS = delimited_text \
11-
grid_maker \
12-
copyright_label \
13-
north_arrow \
14-
gps_importer \
15-
scale_bar \
16-
spit
17-
#SUBDIRS = copyright_label \
18-
# delimited_text \
10+
SUBDIRS = delimited_text
11+
#\
1912
# grid_maker \
20-
# north_arrow \
21-
# scale_bar \
13+
# copyright_label \
2214
# gps_importer \
15+
# scale_bar \
2316
# spit

src/providers/providers.pro

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
#################################################################
1212
TEMPLATE = subdirs
1313
SUBDIRS = ogr delimitedtext
14+
#grass

src/src.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212

1313
TEMPLATE=subdirs
1414

15-
SUBDIRS=core widgets gui providers
15+
SUBDIRS=core widgets gui providers plugins
1616

0 commit comments

Comments
 (0)