Skip to content

Commit c77fc37

Browse files
author
timlinux
committedOct 1, 2007
Reformatted text and fixed application icon suport under msvc
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7238 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-0_9_1
1 parent 5de4821 commit c77fc37

File tree

1 file changed

+160
-168
lines changed

1 file changed

+160
-168
lines changed
 

‎src/app/CMakeLists.txt

Lines changed: 160 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -2,148 +2,148 @@
22
# TODO: delete qgsvectorsymbologywidget.cpp and qgsvectorsymbologywidget.h from SVN
33

44
SET(QGIS_APP_SRCS
5-
main.cpp
6-
qgisapp.cpp
7-
qgisappinterface.cpp
8-
qgsabout.cpp
9-
qgsaddattrdialog.cpp
10-
qgsattributeactiondialog.cpp
11-
qgsattributedialog.cpp
12-
qgsattributetable.cpp
13-
qgsattributetabledisplay.cpp
14-
qgsbookmarkitem.cpp
15-
qgsbookmarks.cpp
16-
qgsclipboard.cpp
17-
qgscontinuouscolordialog.cpp
18-
qgscustomprojectiondialog.cpp
19-
qgsdelattrdialog.cpp
20-
qgsfillstylewidget.cpp
21-
qgsgeomtypedialog.cpp
22-
qgsgraduatedsymboldialog.cpp
23-
qgshelpviewer.cpp
24-
qgsidentifyresults.cpp
25-
qgslabeldialog.cpp
26-
qgslinestyledialog.cpp
27-
qgslinestylewidget.cpp
28-
qgsludialog.cpp
29-
qgsmaptooladdfeature.cpp
30-
qgsmaptooladdisland.cpp
31-
qgsmaptooladdring.cpp
32-
qgsmaptoolcapture.cpp
33-
qgsmaptoolidentify.cpp
34-
qgsmaptoolselect.cpp
35-
qgsmaptoolvertexedit.cpp
36-
qgsmarkerdialog.cpp
37-
qgsmeasuredialog.cpp
38-
qgsmeasuretool.cpp
39-
qgsnewhttpconnection.cpp
40-
qgsnumericsortlistviewitem.cpp
41-
qgsoptions.cpp
42-
qgspastetransformations.cpp
43-
qgspatterndialog.cpp
44-
qgspluginitem.cpp
45-
qgspluginmanager.cpp
46-
qgspluginmetadata.cpp
47-
qgspluginregistry.cpp
48-
qgspointstylewidget.cpp
49-
qgsprojectproperties.cpp
50-
qgsrasterlayerproperties.cpp
51-
qgssearchquerybuilder.cpp
52-
qgsserversourceselect.cpp
53-
qgssinglesymboldialog.cpp
54-
qgsuniquevaluedialog.cpp
55-
qgsvectorlayerproperties.cpp
56-
57-
composer/qgscomposer.cpp
58-
composer/qgscomposeritem.cpp
59-
composer/qgscomposerlabel.cpp
60-
composer/qgscomposerpicture.cpp
61-
composer/qgscomposermap.cpp
62-
composer/qgscomposerscalebar.cpp
63-
composer/qgscomposervectorlegend.cpp
64-
composer/qgscomposerview.cpp
65-
composer/qgscomposition.cpp
66-
67-
legend/qgslegendgroup.cpp
68-
legend/qgslegend.cpp
69-
legend/qgslegenditem.cpp
70-
legend/qgslegendlayer.cpp
71-
legend/qgslegendlayerfile.cpp
72-
legend/qgslegendlayerfilegroup.cpp
73-
legend/qgslegendpropertygroup.cpp
74-
legend/qgslegendpropertyitem.cpp
75-
legend/qgslegendsymbologygroup.cpp
76-
legend/qgslegendsymbologyitem.cpp
77-
legend/qgslegendvectorsymbologyitem.cpp
78-
)
5+
main.cpp
6+
qgisapp.cpp
7+
qgisappinterface.cpp
8+
qgsabout.cpp
9+
qgsaddattrdialog.cpp
10+
qgsattributeactiondialog.cpp
11+
qgsattributedialog.cpp
12+
qgsattributetable.cpp
13+
qgsattributetabledisplay.cpp
14+
qgsbookmarkitem.cpp
15+
qgsbookmarks.cpp
16+
qgsclipboard.cpp
17+
qgscontinuouscolordialog.cpp
18+
qgscustomprojectiondialog.cpp
19+
qgsdelattrdialog.cpp
20+
qgsfillstylewidget.cpp
21+
qgsgeomtypedialog.cpp
22+
qgsgraduatedsymboldialog.cpp
23+
qgshelpviewer.cpp
24+
qgsidentifyresults.cpp
25+
qgslabeldialog.cpp
26+
qgslinestyledialog.cpp
27+
qgslinestylewidget.cpp
28+
qgsludialog.cpp
29+
qgsmaptooladdfeature.cpp
30+
qgsmaptooladdisland.cpp
31+
qgsmaptooladdring.cpp
32+
qgsmaptoolcapture.cpp
33+
qgsmaptoolidentify.cpp
34+
qgsmaptoolselect.cpp
35+
qgsmaptoolvertexedit.cpp
36+
qgsmarkerdialog.cpp
37+
qgsmeasuredialog.cpp
38+
qgsmeasuretool.cpp
39+
qgsnewhttpconnection.cpp
40+
qgsnumericsortlistviewitem.cpp
41+
qgsoptions.cpp
42+
qgspastetransformations.cpp
43+
qgspatterndialog.cpp
44+
qgspluginitem.cpp
45+
qgspluginmanager.cpp
46+
qgspluginmetadata.cpp
47+
qgspluginregistry.cpp
48+
qgspointstylewidget.cpp
49+
qgsprojectproperties.cpp
50+
qgsrasterlayerproperties.cpp
51+
qgssearchquerybuilder.cpp
52+
qgsserversourceselect.cpp
53+
qgssinglesymboldialog.cpp
54+
qgsuniquevaluedialog.cpp
55+
qgsvectorlayerproperties.cpp
56+
57+
composer/qgscomposer.cpp
58+
composer/qgscomposeritem.cpp
59+
composer/qgscomposerlabel.cpp
60+
composer/qgscomposerpicture.cpp
61+
composer/qgscomposermap.cpp
62+
composer/qgscomposerscalebar.cpp
63+
composer/qgscomposervectorlegend.cpp
64+
composer/qgscomposerview.cpp
65+
composer/qgscomposition.cpp
66+
67+
legend/qgslegendgroup.cpp
68+
legend/qgslegend.cpp
69+
legend/qgslegenditem.cpp
70+
legend/qgslegendlayer.cpp
71+
legend/qgslegendlayerfile.cpp
72+
legend/qgslegendlayerfilegroup.cpp
73+
legend/qgslegendpropertygroup.cpp
74+
legend/qgslegendpropertyitem.cpp
75+
legend/qgslegendsymbologygroup.cpp
76+
legend/qgslegendsymbologyitem.cpp
77+
legend/qgslegendvectorsymbologyitem.cpp
78+
)
7979

8080

8181
SET (QGIS_APP_MOC_HDRS
8282

83-
qgisapp.h
84-
qgisappinterface.h
85-
qgsabout.h
86-
qgsaddattrdialog.h
87-
qgsattributeactiondialog.h
88-
qgsattributedialog.h
89-
qgsattributetabledisplay.h
90-
qgsattributetable.h
91-
qgsbookmarks.h
92-
qgscontinuouscolordialog.h
93-
qgscustomprojectiondialog.h
94-
qgsdelattrdialog.h
95-
qgsfillstylewidget.h
96-
qgsgeomtypedialog.h
97-
qgsgraduatedsymboldialog.h
98-
qgshelpviewer.h
99-
qgsidentifyresults.h
100-
qgslabeldialog.h
101-
qgslinestyledialog.h
102-
qgslinestylewidget.h
103-
qgsludialog.h
104-
qgsmaplayerinterface.h
105-
qgsmaptoolidentify.h
106-
qgsmarkerdialog.h
107-
qgsmeasuredialog.h
108-
qgsnewhttpconnection.h
109-
qgsoptions.h
110-
qgspastetransformations.h
111-
qgspatterndialog.h
112-
qgspluginmanager.h
113-
qgspointstylewidget.h
114-
qgsprojectproperties.h
115-
qgsrasterlayerproperties.h
116-
qgssearchquerybuilder.h
117-
qgsserversourceselect.h
118-
qgssinglesymboldialog.h
119-
qgsuniquevaluedialog.h
120-
qgsvectorlayerproperties.h
121-
122-
composer/qgscomposer.h
123-
composer/qgscomposerlabel.h
124-
composer/qgscomposerpicture.h
125-
composer/qgscomposermap.h
126-
composer/qgscomposerscalebar.h
127-
composer/qgscomposervectorlegend.h
128-
composer/qgscomposerview.h
129-
composer/qgscomposition.h
130-
131-
legend/qgslegend.h
132-
legend/qgslegendlayer.h
133-
legend/qgslegendlayerfile.h
134-
)
83+
qgisapp.h
84+
qgisappinterface.h
85+
qgsabout.h
86+
qgsaddattrdialog.h
87+
qgsattributeactiondialog.h
88+
qgsattributedialog.h
89+
qgsattributetabledisplay.h
90+
qgsattributetable.h
91+
qgsbookmarks.h
92+
qgscontinuouscolordialog.h
93+
qgscustomprojectiondialog.h
94+
qgsdelattrdialog.h
95+
qgsfillstylewidget.h
96+
qgsgeomtypedialog.h
97+
qgsgraduatedsymboldialog.h
98+
qgshelpviewer.h
99+
qgsidentifyresults.h
100+
qgslabeldialog.h
101+
qgslinestyledialog.h
102+
qgslinestylewidget.h
103+
qgsludialog.h
104+
qgsmaplayerinterface.h
105+
qgsmaptoolidentify.h
106+
qgsmarkerdialog.h
107+
qgsmeasuredialog.h
108+
qgsnewhttpconnection.h
109+
qgsoptions.h
110+
qgspastetransformations.h
111+
qgspatterndialog.h
112+
qgspluginmanager.h
113+
qgspointstylewidget.h
114+
qgsprojectproperties.h
115+
qgsrasterlayerproperties.h
116+
qgssearchquerybuilder.h
117+
qgsserversourceselect.h
118+
qgssinglesymboldialog.h
119+
qgsuniquevaluedialog.h
120+
qgsvectorlayerproperties.h
121+
122+
composer/qgscomposer.h
123+
composer/qgscomposerlabel.h
124+
composer/qgscomposerpicture.h
125+
composer/qgscomposermap.h
126+
composer/qgscomposerscalebar.h
127+
composer/qgscomposervectorlegend.h
128+
composer/qgscomposerview.h
129+
composer/qgscomposition.h
130+
131+
legend/qgslegend.h
132+
legend/qgslegendlayer.h
133+
legend/qgslegendlayerfile.h
134+
)
135135

136136
IF (POSTGRES_FOUND)
137137
SET (QGIS_APP_SRCS ${QGIS_APP_SRCS}
138-
qgsdbsourceselect.cpp
139-
qgsnewconnection.cpp
140-
qgspgquerybuilder.cpp
141-
)
138+
qgsdbsourceselect.cpp
139+
qgsnewconnection.cpp
140+
qgspgquerybuilder.cpp
141+
)
142142
SET (QGIS_APP_MOC_HDRS ${QGIS_APP_MOC_HDRS}
143-
qgsdbsourceselect.h
144-
qgsnewconnection.h
145-
qgspgquerybuilder.h
146-
)
143+
qgsdbsourceselect.h
144+
qgsnewconnection.h
145+
qgspgquerybuilder.h
146+
)
147147
ENDIF (POSTGRES_FOUND)
148148

149149
# Python support
@@ -156,55 +156,47 @@ QT4_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS})
156156

157157

158158

159-
IF (WIN32 AND NOT MSVC)
159+
IF (WIN32)
160+
161+
IF (MSVC)
162+
SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/qgis_win32.rc)
163+
ELSE(MSVC)
160164

161-
# Icon for windows
162-
# Note: can't include .rc directly to source files
163-
# as it's ignored when used MinGW
165+
# Icon for windows MINGW
166+
# Note: can't include .rc directly to source files
167+
# as it's ignored when used MinGW
164168

165-
IF (NOT WINDRES)
166-
FIND_PROGRAM(WINDRES windres)
167169
IF (NOT WINDRES)
168-
MESSAGE(FATAL_ERROR "windres not found - aborting")
170+
FIND_PROGRAM(WINDRES windres)
171+
IF (NOT WINDRES)
172+
MESSAGE(FATAL_ERROR "windres not found - aborting")
173+
ENDIF (NOT WINDRES)
169174
ENDIF (NOT WINDRES)
170-
ENDIF (NOT WINDRES)
171-
172-
173-
174-
#############################################################
175-
# application icon
176-
IF( MINGW )
175+
#############################################################
176+
# application icon
177177
# resource compilation for MinGW
178178
ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon.o
179179
COMMAND ${WINDRES} -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/qgis_win32.rc
180180
-o ${CMAKE_CURRENT_BINARY_DIR}/icon.o )
181181
SET(QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/icon.o)
182-
ELSE( MINGW )
183-
SET(QGIS_APP_SRCS ${QGIS_APP_SRCS} icon.rc)
184-
ENDIF( MINGW )
185-
186-
ENDIF (WIN32 AND NOT MSVC)
182+
ENDIF (MSVC)
183+
ENDIF (WIN32)
187184

188-
# This is the right way to include icon in MSVC but currently
189-
# it ends with error that qgis_win322.ico is old DIB and it has to be converted
190-
#IF (MSVC)
191-
# SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/../qgis_win32.rc)
192-
#ENDIF (MSVC)
193185

194186

195187
INCLUDE_DIRECTORIES(
196-
${CMAKE_CURRENT_SOURCE_DIR} composer legend
197-
${CMAKE_CURRENT_BINARY_DIR}
198-
${CMAKE_CURRENT_BINARY_DIR}/../ui
199-
../core
200-
../core/raster ../core/renderer ../core/symbology
201-
../gui
202-
../plugins
188+
${CMAKE_CURRENT_SOURCE_DIR} composer legend
189+
${CMAKE_CURRENT_BINARY_DIR}
190+
${CMAKE_CURRENT_BINARY_DIR}/../ui
191+
../core
192+
../core/raster ../core/renderer ../core/symbology
193+
../gui
194+
../plugins
203195
${PROJ_INCLUDE_DIR}
204196
${SQLITE3_INCLUDE_DIR}
205197
${GEOS_INCLUDE_DIR}
206198
${GDAL_INCLUDE_DIR}
207-
)
199+
)
208200

209201
IF (POSTGRES_FOUND)
210202
INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
@@ -222,12 +214,12 @@ TARGET_LINK_LIBRARIES(qgis
222214
${QT_LIBRARIES}
223215
qgis_core
224216
qgis_gui
225-
)
217+
)
226218

227219
SET_TARGET_PROPERTIES(qgis PROPERTIES
228220
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
229221
INSTALL_RPATH_USE_LINK_PATH true
230-
)
222+
)
231223

232224
IF (PYTHON_FOUND)
233225
TARGET_LINK_LIBRARIES(qgis ${PYTHON_LIBRARIES})

0 commit comments

Comments
 (0)
Please sign in to comment.