Merge of changes from analysis branch

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11552 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 5, 2009 · aa71b1e · aa71b1e
1 parent 29ec481
commit aa71b1e
Show file tree

Hide file tree

Showing 38 changed files with 7,539 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -282,16 +282,19 @@ IF (WIN32)
     ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
     ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
     ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllimport)")
+    ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllimport)")
   ELSE (MSVC)
     ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
     ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
     ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllimport)\"")
+    ADD_DEFINITIONS("\"-DANALYSIS_EXPORT=__declspec(dllimport)\"")
   ENDIF (MSVC)
 ELSE (WIN32)
   # other compilers don't use that MSVC construct
   ADD_DEFINITIONS(-DCORE_EXPORT=)
   ADD_DEFINITIONS(-DGUI_EXPORT=)
   ADD_DEFINITIONS(-DPYTHON_EXPORT=)
+  ADD_DEFINITIONS(-DANALYSIS_EXPORT=)
 ENDIF (WIN32)
 
 #############################################################

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-SUBDIRS(core ui gui app providers plugins helpviewer)
+SUBDIRS(core analysis ui gui app providers plugins helpviewer)
 
 IF (HAVE_PYTHON AND WITH_BINDINGS)
   SUBDIRS(python)

diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -0,0 +1,92 @@
+
+
+#############################################################
+# sources
+
+SET(QGIS_ANALYSIS_SRCS
+  interpolation/qgsgridfilewriter.cpp
+  interpolation/qgsidwinterpolator.cpp
+  interpolation/qgsinterpolator.cpp
+  interpolation/qgstininterpolator.cpp
+  interpolation/DualEdgeTriangulation.cc
+  interpolation/HalfEdge.cc
+  interpolation/Line3D.cc
+  interpolation/LinTriangleInterpolator.cc
+  interpolation/MathUtils.cc
+  interpolation/Node.cc
+  interpolation/Point3D.cc
+  interpolation/TriangleInterpolator.cc
+  interpolation/Triangulation.cc
+  interpolation/Vector3D.cc
+  vector/qgsgeometryanalyzer.cpp
+)
+
+SET(QGIS_ANALYSIS_MOC_HDRS
+)
+
+QT4_WRAP_CPP(QGIS_ANALYSIS_MOC_SRCS ${QGIS_ANALYSIS_MOC_HDRS})
+
+
+INCLUDE_DIRECTORIES(
+  ${CMAKE_CURRENT_SOURCE_DIR} 
+  ${CMAKE_CURRENT_SOURCE_DIR}/../core/
+  interpolation
+  ${PROJ_INCLUDE_DIR}
+  ${GEOS_INCLUDE_DIR}
+  ${GDAL_INCLUDE_DIR}
+)
+
+IF (WIN32)
+  IF (MSVC)
+    ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllexport)")
+  ELSE (MSVC)
+    ADD_DEFINITIONS("-UANALYSIS_EXPORT \"-DANALYSIS_EXPORT=__declspec(dllexport)\"")
+  ENDIF (MSVC)
+ENDIF (WIN32)
+
+
+#############################################################
+# qgis_analysis library
+
+ADD_LIBRARY(qgis_analysis SHARED ${QGIS_ANALYSIS_SRCS} ${QGIS_ANALYSIS_MOC_SRCS} )
+
+ADD_DEPENDENCIES(qgis_analysis core)
+
+SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES
+			VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
+			SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
+
+
+# because of htonl
+IF (WIN32)
+  SET(PLATFORM_LIBRARIES wsock32)
+  IF (MSVC)
+    #needed for linking to gdal which needs odbc
+    SET(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} odbc32 odbccp32)
+  ENDIF (MSVC)
+ENDIF (WIN32)
+
+TARGET_LINK_LIBRARIES(qgis_analysis
+  qgis_core
+  ${QT_QTCORE_LIBRARY} 
+  ${QT_QTGUI_LIBRARY} 
+  ${QT_QTMAIN_LIBRARY} 
+  ${PROJ_LIBRARY}
+  ${GEOS_LIBRARY}
+  ${GDAL_LIBRARY}
+  ${PLATFORM_LIBRARIES}
+)
+
+INSTALL(TARGETS qgis_analysis
+  RUNTIME DESTINATION ${QGIS_BIN_DIR}
+  LIBRARY DESTINATION ${QGIS_LIB_DIR}
+  ARCHIVE DESTINATION ${QGIS_LIB_DIR})
+
+
+# Added by Tim to install headers
+
+SET(QGIS_ANALYSIS_HDRS
+)
+
+INSTALL(CODE "MESSAGE(\"Installing ANALYSIS headers...\")")
+INSTALL(FILES ${QGIS_ANALYSIS_HDRS} ${QGIS_ANALYSIS_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})