Skip to content

Commit aa71b1e

Browse files
author
mhugent
committed
Merge of changes from analysis branch
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11552 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 29ec481 commit aa71b1e

38 files changed

+7539
-5
lines changed

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,16 +282,19 @@ IF (WIN32)
282282
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
283283
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
284284
ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllimport)")
285+
ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllimport)")
285286
ELSE (MSVC)
286287
ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
287288
ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
288289
ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllimport)\"")
290+
ADD_DEFINITIONS("\"-DANALYSIS_EXPORT=__declspec(dllimport)\"")
289291
ENDIF (MSVC)
290292
ELSE (WIN32)
291293
# other compilers don't use that MSVC construct
292294
ADD_DEFINITIONS(-DCORE_EXPORT=)
293295
ADD_DEFINITIONS(-DGUI_EXPORT=)
294296
ADD_DEFINITIONS(-DPYTHON_EXPORT=)
297+
ADD_DEFINITIONS(-DANALYSIS_EXPORT=)
295298
ENDIF (WIN32)
296299

297300
#############################################################

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
SUBDIRS(core ui gui app providers plugins helpviewer)
2+
SUBDIRS(core analysis ui gui app providers plugins helpviewer)
33

44
IF (HAVE_PYTHON AND WITH_BINDINGS)
55
SUBDIRS(python)

src/analysis/CMakeLists.txt

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
2+
3+
#############################################################
4+
# sources
5+
6+
SET(QGIS_ANALYSIS_SRCS
7+
interpolation/qgsgridfilewriter.cpp
8+
interpolation/qgsidwinterpolator.cpp
9+
interpolation/qgsinterpolator.cpp
10+
interpolation/qgstininterpolator.cpp
11+
interpolation/DualEdgeTriangulation.cc
12+
interpolation/HalfEdge.cc
13+
interpolation/Line3D.cc
14+
interpolation/LinTriangleInterpolator.cc
15+
interpolation/MathUtils.cc
16+
interpolation/Node.cc
17+
interpolation/Point3D.cc
18+
interpolation/TriangleInterpolator.cc
19+
interpolation/Triangulation.cc
20+
interpolation/Vector3D.cc
21+
vector/qgsgeometryanalyzer.cpp
22+
)
23+
24+
SET(QGIS_ANALYSIS_MOC_HDRS
25+
)
26+
27+
QT4_WRAP_CPP(QGIS_ANALYSIS_MOC_SRCS ${QGIS_ANALYSIS_MOC_HDRS})
28+
29+
30+
INCLUDE_DIRECTORIES(
31+
${CMAKE_CURRENT_SOURCE_DIR}
32+
${CMAKE_CURRENT_SOURCE_DIR}/../core/
33+
interpolation
34+
${PROJ_INCLUDE_DIR}
35+
${GEOS_INCLUDE_DIR}
36+
${GDAL_INCLUDE_DIR}
37+
)
38+
39+
IF (WIN32)
40+
IF (MSVC)
41+
ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllexport)")
42+
ELSE (MSVC)
43+
ADD_DEFINITIONS("-UANALYSIS_EXPORT \"-DANALYSIS_EXPORT=__declspec(dllexport)\"")
44+
ENDIF (MSVC)
45+
ENDIF (WIN32)
46+
47+
48+
#############################################################
49+
# qgis_analysis library
50+
51+
ADD_LIBRARY(qgis_analysis SHARED ${QGIS_ANALYSIS_SRCS} ${QGIS_ANALYSIS_MOC_SRCS} )
52+
53+
ADD_DEPENDENCIES(qgis_analysis core)
54+
55+
SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
56+
VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
57+
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
58+
59+
60+
# because of htonl
61+
IF (WIN32)
62+
SET(PLATFORM_LIBRARIES wsock32)
63+
IF (MSVC)
64+
#needed for linking to gdal which needs odbc
65+
SET(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} odbc32 odbccp32)
66+
ENDIF (MSVC)
67+
ENDIF (WIN32)
68+
69+
TARGET_LINK_LIBRARIES(qgis_analysis
70+
qgis_core
71+
${QT_QTCORE_LIBRARY}
72+
${QT_QTGUI_LIBRARY}
73+
${QT_QTMAIN_LIBRARY}
74+
${PROJ_LIBRARY}
75+
${GEOS_LIBRARY}
76+
${GDAL_LIBRARY}
77+
${PLATFORM_LIBRARIES}
78+
)
79+
80+
INSTALL(TARGETS qgis_analysis
81+
RUNTIME DESTINATION ${QGIS_BIN_DIR}
82+
LIBRARY DESTINATION ${QGIS_LIB_DIR}
83+
ARCHIVE DESTINATION ${QGIS_LIB_DIR})
84+
85+
86+
# Added by Tim to install headers
87+
88+
SET(QGIS_ANALYSIS_HDRS
89+
)
90+
91+
INSTALL(CODE "MESSAGE(\"Installing ANALYSIS headers...\")")
92+
INSTALL(FILES ${QGIS_ANALYSIS_HDRS} ${QGIS_ANALYSIS_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})

0 commit comments

Comments
 (0)