Skip to content

Commit 0731173

Browse files
author
homann
committed
Include paths ending with a '.' didn't work on my Win2k sp4, so I replaced any reference in INCLUDE_DIRECTORIES to '.' with ${CMAKE_CURRENT_SOURCEDIR}
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6459 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent eb03f9a commit 0731173

File tree

4 files changed

+206
-206
lines changed

4 files changed

+206
-206
lines changed

‎src/app/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ ENDIF (WIN32)
179179

180180

181181
INCLUDE_DIRECTORIES(
182-
. composer legend
182+
${CMAKE_CURRENT_SOURCE_DIR} composer legend
183183
${CMAKE_CURRENT_BINARY_DIR}
184184
${CMAKE_CURRENT_BINARY_DIR}/../ui
185185
../core

‎src/core/CMakeLists.txt‎

Lines changed: 158 additions & 158 deletions
Original file line numberDiff line numberDiff line change
@@ -1,158 +1,158 @@
1-
2-
3-
#############################################################
4-
# sources
5-
6-
SET(QGIS_CORE_SRCS
7-
qgis.cpp
8-
qgsapplication.cpp
9-
qgsattributeaction.cpp
10-
qgsclipper.cpp
11-
qgscontexthelp.cpp
12-
qgscoordinatetransform.cpp
13-
qgsdatasourceuri.cpp
14-
qgsdistancearea.cpp
15-
qgsexception.cpp
16-
qgsfeature.cpp
17-
qgsfeatureattribute.cpp
18-
qgsfield.cpp
19-
qgsgeometry.cpp
20-
qgsgeometryvertexindex.cpp
21-
qgshttptransaction.cpp
22-
qgslabel.cpp
23-
qgslabelattributes.cpp
24-
qgsline.cpp
25-
qgslogger.cpp
26-
qgsmaplayer.cpp
27-
qgsmaplayerregistry.cpp
28-
qgsmaprender.cpp
29-
qgsmaptopixel.cpp
30-
qgsmessageoutput.cpp
31-
qgspoint.cpp
32-
qgsproject.cpp
33-
qgsprojectproperty.cpp
34-
qgsprovidercountcalcevent.cpp
35-
qgsproviderextentcalcevent.cpp
36-
qgsprovidermetadata.cpp
37-
qgsproviderregistry.cpp
38-
qgsrasterdataprovider.cpp
39-
qgsrect.cpp
40-
qgsrunprocess.cpp
41-
qgsscalecalculator.cpp
42-
qgssearchstring.cpp
43-
qgssearchtreenode.cpp
44-
qgsspatialrefsys.cpp
45-
qgsvectordataprovider.cpp
46-
qgsvectorfilewriter.cpp
47-
qgsvectorlayer.cpp
48-
49-
raster/qgscolortable.cpp
50-
raster/qgsrasterlayer.cpp
51-
52-
renderer/qgscontinuouscolorrenderer.cpp
53-
renderer/qgsgraduatedsymbolrenderer.cpp
54-
renderer/qgsrangerenderitem.cpp
55-
renderer/qgsrenderer.cpp
56-
renderer/qgsrenderitem.cpp
57-
renderer/qgssinglesymbolrenderer.cpp
58-
renderer/qgsuniquevaluerenderer.cpp
59-
60-
symbology/qgslinesymbol.cpp
61-
symbology/qgsmarkercatalogue.cpp
62-
symbology/qgsmarkersymbol.cpp
63-
symbology/qgspolygonsymbol.cpp
64-
symbology/qgssymbol.cpp
65-
symbology/qgssymbologyutils.cpp
66-
67-
spatialindex/qgsspatialindex.cpp
68-
)
69-
70-
ADD_FLEX_FILES(QGIS_CORE_SRCS qgssearchstringlexer.ll)
71-
72-
ADD_BISON_FILES(QGIS_CORE_SRCS qgssearchstringparser.yy)
73-
74-
SET(QGIS_CORE_MOC_HDRS
75-
qgscontexthelp.h
76-
qgscoordinatetransform.h
77-
qgsdataprovider.h
78-
qgshttptransaction.h
79-
qgsmaplayer.h
80-
qgsmaplayerregistry.h
81-
qgsmaprender.h
82-
qgsmessageoutput.h
83-
qgsproject.h
84-
qgsrasterdataprovider.h
85-
qgsrunprocess.h
86-
qgsvectorlayer.h
87-
88-
raster/qgsrasterlayer.h
89-
)
90-
91-
QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
92-
93-
INCLUDE_DIRECTORIES(. raster renderer symbology
94-
${QT_QTSVG_INCLUDE_DIR}
95-
${PROJ_INCLUDE_DIR}
96-
${SQLITE3_INCLUDE_DIR}
97-
${GEOS_INCLUDE_DIR}
98-
${GDAL_INCLUDE_DIR}
99-
)
100-
101-
IF (WIN32)
102-
IF (MSVC)
103-
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllexport)")
104-
ELSE (MSVC)
105-
ADD_DEFINITIONS("-UCORE_EXPORT \"-DCORE_EXPORT=__declspec(dllexport)\"")
106-
ENDIF (MSVC)
107-
ENDIF (WIN32)
108-
109-
#############################################################
110-
# spatial indexing library
111-
112-
# add path prefix to every specified file
113-
MACRO(PATH_PREFIX OUTPUT PREFIX)
114-
FOREACH(F ${ARGN})
115-
SET(${OUTPUT} ${${OUTPUT}} ${PREFIX}/${F})
116-
ENDFOREACH(F)
117-
ENDMACRO(PATH_PREFIX)
118-
119-
# tools library
120-
PATH_PREFIX(TOOLS_SRC tools ExternalSort.cc ExternalSort.h TemporaryFile.cc Tools.cc)
121-
PATH_PREFIX(GEOM_SRC geometry LineSegment.cc Point.cc Region.cc)
122-
123-
# spatial index library
124-
PATH_PREFIX(SPINDEX_SRC spatialindex SpatialIndexImpl.cc)
125-
PATH_PREFIX(STMAN_SRC storagemanager Buffer.cc DiskStorageManager.cc MemoryStorageManager.cc RandomEvictionsBuffer.cc)
126-
PATH_PREFIX(RTREE_SRC rtree BulkLoader.cc Index.cc Leaf.cc Node.cc RTree.cc Statistics.cc)
127-
128-
INCLUDE_DIRECTORIES(spatialindex/include)
129-
130-
SET(SPINDEX_SRC ${TOOLS_SRC} ${GEOM_SRC} ${SPINDEX_SRC} ${STMAN_SRC} ${RTREE_SRC})
131-
132-
PATH_PREFIX(INDEX_SRC spatialindex ${SPINDEX_SRC})
133-
134-
#############################################################
135-
# qgis_core library
136-
137-
ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC})
138-
139-
# make sure to create qgssvnversion.h before compiling
140-
ADD_DEPENDENCIES(qgis_core svnversion)
141-
142-
# because of htonl
143-
IF (WIN32)
144-
SET(PLATFORM_LIBRARIES wsock32)
145-
ENDIF (WIN32)
146-
147-
TARGET_LINK_LIBRARIES(qgis_core
148-
${QT_LIBRARIES} ${QT_QTSVG_LIBRARY}
149-
${PROJ_LIBRARY}
150-
${SQLITE3_LIBRARY}
151-
${GEOS_LIBRARY}
152-
${GDAL_LIBRARY}
153-
${PLATFORM_LIBRARIES}
154-
)
155-
156-
INSTALL(TARGETS qgis_core
157-
RUNTIME DESTINATION ${QGIS_BIN_DIR}
158-
LIBRARY DESTINATION lib)
1+
2+
3+
#############################################################
4+
# sources
5+
6+
SET(QGIS_CORE_SRCS
7+
qgis.cpp
8+
qgsapplication.cpp
9+
qgsattributeaction.cpp
10+
qgsclipper.cpp
11+
qgscontexthelp.cpp
12+
qgscoordinatetransform.cpp
13+
qgsdatasourceuri.cpp
14+
qgsdistancearea.cpp
15+
qgsexception.cpp
16+
qgsfeature.cpp
17+
qgsfeatureattribute.cpp
18+
qgsfield.cpp
19+
qgsgeometry.cpp
20+
qgsgeometryvertexindex.cpp
21+
qgshttptransaction.cpp
22+
qgslabel.cpp
23+
qgslabelattributes.cpp
24+
qgsline.cpp
25+
qgslogger.cpp
26+
qgsmaplayer.cpp
27+
qgsmaplayerregistry.cpp
28+
qgsmaprender.cpp
29+
qgsmaptopixel.cpp
30+
qgsmessageoutput.cpp
31+
qgspoint.cpp
32+
qgsproject.cpp
33+
qgsprojectproperty.cpp
34+
qgsprovidercountcalcevent.cpp
35+
qgsproviderextentcalcevent.cpp
36+
qgsprovidermetadata.cpp
37+
qgsproviderregistry.cpp
38+
qgsrasterdataprovider.cpp
39+
qgsrect.cpp
40+
qgsrunprocess.cpp
41+
qgsscalecalculator.cpp
42+
qgssearchstring.cpp
43+
qgssearchtreenode.cpp
44+
qgsspatialrefsys.cpp
45+
qgsvectordataprovider.cpp
46+
qgsvectorfilewriter.cpp
47+
qgsvectorlayer.cpp
48+
49+
raster/qgscolortable.cpp
50+
raster/qgsrasterlayer.cpp
51+
52+
renderer/qgscontinuouscolorrenderer.cpp
53+
renderer/qgsgraduatedsymbolrenderer.cpp
54+
renderer/qgsrangerenderitem.cpp
55+
renderer/qgsrenderer.cpp
56+
renderer/qgsrenderitem.cpp
57+
renderer/qgssinglesymbolrenderer.cpp
58+
renderer/qgsuniquevaluerenderer.cpp
59+
60+
symbology/qgslinesymbol.cpp
61+
symbology/qgsmarkercatalogue.cpp
62+
symbology/qgsmarkersymbol.cpp
63+
symbology/qgspolygonsymbol.cpp
64+
symbology/qgssymbol.cpp
65+
symbology/qgssymbologyutils.cpp
66+
67+
spatialindex/qgsspatialindex.cpp
68+
)
69+
70+
ADD_FLEX_FILES(QGIS_CORE_SRCS qgssearchstringlexer.ll)
71+
72+
ADD_BISON_FILES(QGIS_CORE_SRCS qgssearchstringparser.yy)
73+
74+
SET(QGIS_CORE_MOC_HDRS
75+
qgscontexthelp.h
76+
qgscoordinatetransform.h
77+
qgsdataprovider.h
78+
qgshttptransaction.h
79+
qgsmaplayer.h
80+
qgsmaplayerregistry.h
81+
qgsmaprender.h
82+
qgsmessageoutput.h
83+
qgsproject.h
84+
qgsrasterdataprovider.h
85+
qgsrunprocess.h
86+
qgsvectorlayer.h
87+
88+
raster/qgsrasterlayer.h
89+
)
90+
91+
QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
92+
93+
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} raster renderer symbology
94+
${QT_QTSVG_INCLUDE_DIR}
95+
${PROJ_INCLUDE_DIR}
96+
${SQLITE3_INCLUDE_DIR}
97+
${GEOS_INCLUDE_DIR}
98+
${GDAL_INCLUDE_DIR}
99+
)
100+
101+
IF (WIN32)
102+
IF (MSVC)
103+
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllexport)")
104+
ELSE (MSVC)
105+
ADD_DEFINITIONS("-UCORE_EXPORT \"-DCORE_EXPORT=__declspec(dllexport)\"")
106+
ENDIF (MSVC)
107+
ENDIF (WIN32)
108+
109+
#############################################################
110+
# spatial indexing library
111+
112+
# add path prefix to every specified file
113+
MACRO(PATH_PREFIX OUTPUT PREFIX)
114+
FOREACH(F ${ARGN})
115+
SET(${OUTPUT} ${${OUTPUT}} ${PREFIX}/${F})
116+
ENDFOREACH(F)
117+
ENDMACRO(PATH_PREFIX)
118+
119+
# tools library
120+
PATH_PREFIX(TOOLS_SRC tools ExternalSort.cc ExternalSort.h TemporaryFile.cc Tools.cc)
121+
PATH_PREFIX(GEOM_SRC geometry LineSegment.cc Point.cc Region.cc)
122+
123+
# spatial index library
124+
PATH_PREFIX(SPINDEX_SRC spatialindex SpatialIndexImpl.cc)
125+
PATH_PREFIX(STMAN_SRC storagemanager Buffer.cc DiskStorageManager.cc MemoryStorageManager.cc RandomEvictionsBuffer.cc)
126+
PATH_PREFIX(RTREE_SRC rtree BulkLoader.cc Index.cc Leaf.cc Node.cc RTree.cc Statistics.cc)
127+
128+
INCLUDE_DIRECTORIES(spatialindex/include)
129+
130+
SET(SPINDEX_SRC ${TOOLS_SRC} ${GEOM_SRC} ${SPINDEX_SRC} ${STMAN_SRC} ${RTREE_SRC})
131+
132+
PATH_PREFIX(INDEX_SRC spatialindex ${SPINDEX_SRC})
133+
134+
#############################################################
135+
# qgis_core library
136+
137+
ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC})
138+
139+
# make sure to create qgssvnversion.h before compiling
140+
ADD_DEPENDENCIES(qgis_core svnversion)
141+
142+
# because of htonl
143+
IF (WIN32)
144+
SET(PLATFORM_LIBRARIES wsock32)
145+
ENDIF (WIN32)
146+
147+
TARGET_LINK_LIBRARIES(qgis_core
148+
${QT_LIBRARIES} ${QT_QTSVG_LIBRARY}
149+
${PROJ_LIBRARY}
150+
${SQLITE3_LIBRARY}
151+
${GEOS_LIBRARY}
152+
${GDAL_LIBRARY}
153+
${PLATFORM_LIBRARIES}
154+
)
155+
156+
INSTALL(TARGETS qgis_core
157+
RUNTIME DESTINATION ${QGIS_BIN_DIR}
158+
LIBRARY DESTINATION lib)

‎src/gui/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ qgsprojectionselector.h
3131

3232
QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
3333

34-
INCLUDE_DIRECTORIES(. ../core
34+
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ../core
3535
../core/raster ../core/renderer ../core/symbology
3636
${SQLITE3_INCLUDE_DIR}
3737
${CMAKE_CURRENT_BINARY_DIR}

0 commit comments

Comments
 (0)