[QGIS Commit] r10300 - in branches/analysis_branch/src/analysis: . interpolation

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2009-03-19 13:13:47 -0400 (Thu, 19 Mar 2009)
New Revision: 10300

Added:
   branches/analysis_branch/src/analysis/CMakeLists.txt
Modified:
   branches/analysis_branch/src/analysis/interpolation/qgsgridfilewriter.cpp
   branches/analysis_branch/src/analysis/interpolation/qgstininterpolator.cpp
Log:
Initial commit of cmake file for analysis


Added: branches/analysis_branch/src/analysis/CMakeLists.txt
===================================================================
--- branches/analysis_branch/src/analysis/CMakeLists.txt	                        (rev 0)
+++ branches/analysis_branch/src/analysis/CMakeLists.txt	2009-03-19 17:13:47 UTC (rev 10300)
@@ -0,0 +1,90 @@
+
+
+#############################################################
+# 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
+)
+
+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
+  ${QT_QTANALYSIS_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}) 

Modified: branches/analysis_branch/src/analysis/interpolation/qgsgridfilewriter.cpp
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/qgsgridfilewriter.cpp	2009-03-19 16:57:18 UTC (rev 10299)
+++ branches/analysis_branch/src/analysis/interpolation/qgsgridfilewriter.cpp	2009-03-19 17:13:47 UTC (rev 10300)
@@ -65,7 +65,6 @@
     progressDialog = new QProgressDialog( QObject::tr( "Interpolating..." ), QObject::tr( "Abort" ), 0, mNumRows, 0 );
     progressDialog->setWindowModality( Qt::WindowModal );
   }
-
   for ( int i = 0; i < mNumRows; ++i )
   {
     currentXValue = mInterpolationExtent.xMinimum();

Modified: branches/analysis_branch/src/analysis/interpolation/qgstininterpolator.cpp
===================================================================
--- branches/analysis_branch/src/analysis/interpolation/qgstininterpolator.cpp	2009-03-19 16:57:18 UTC (rev 10299)
+++ branches/analysis_branch/src/analysis/interpolation/qgstininterpolator.cpp	2009-03-19 17:13:47 UTC (rev 10300)
@@ -19,7 +19,7 @@
 #include "DualEdgeTriangulation.h"
 #include "LinTriangleInterpolator.h"
 #include "Point3D.h"
-#include "qgssinglesymbolrenderer.h"
+//#include "qgssinglesymbolrenderer.h"
 #include "qgsvectorlayer.h"
 
 QgsTINInterpolator::QgsTINInterpolator( const QList<QgsVectorLayer*>& inputData ): QgsInterpolator( inputData ), mTriangulation( 0 ), mTriangleInterpolator( 0 ), mIsInitialized( false )