[QGIS Commit] r8692 - in trunk/qgis/src/providers: delimitedtext gpx

svn_qgis at osgeo.org svn_qgis at osgeo.org
Mon Jun 30 09:09:41 EDT 2008


Author: jef
Date: 2008-06-30 09:09:41 -0400 (Mon, 30 Jun 2008)
New Revision: 8692

Modified:
   trunk/qgis/src/providers/delimitedtext/CMakeLists.txt
   trunk/qgis/src/providers/gpx/CMakeLists.txt
Log:
fix windows link errors

Modified: trunk/qgis/src/providers/delimitedtext/CMakeLists.txt
===================================================================
--- trunk/qgis/src/providers/delimitedtext/CMakeLists.txt	2008-06-30 11:36:25 UTC (rev 8691)
+++ trunk/qgis/src/providers/delimitedtext/CMakeLists.txt	2008-06-30 13:09:41 UTC (rev 8692)
@@ -4,9 +4,7 @@
 
 SET (DTEXT_SRCS qgsdelimitedtextprovider.cpp)
 
-SET (DTEXT_MOC_HDRS
-	qgsdelimitedtextprovider.h
-)
+SET (DTEXT_MOC_HDRS	qgsdelimitedtextprovider.h)
 
 ########################################################
 # Build
@@ -18,8 +16,10 @@
   ${GEOS_INCLUDE_DIR}
 )
 
-ADD_LIBRARY(delimitedtextprovider MODULE ${DTEXT_SRCS})
+QT4_WRAP_CPP(DTEXT_MOC_SRCS ${DTEXT_MOC_HDRS})
 
+ADD_LIBRARY(delimitedtextprovider MODULE ${DTEXT_SRCS} ${DTEXT_MOC_SRCS})
+
 TARGET_LINK_LIBRARIES(delimitedtextprovider
   ${QT_QTCORE_LIBRARY} 
   ${QT_QTXML_LIBRARY} 

Modified: trunk/qgis/src/providers/gpx/CMakeLists.txt
===================================================================
--- trunk/qgis/src/providers/gpx/CMakeLists.txt	2008-06-30 11:36:25 UTC (rev 8691)
+++ trunk/qgis/src/providers/gpx/CMakeLists.txt	2008-06-30 13:09:41 UTC (rev 8692)
@@ -8,7 +8,6 @@
 	qgsgpxprovider.h
 )
 
-
 ########################################################
 # Build
 
@@ -18,8 +17,10 @@
   ${EXPAT_INCLUDE_DIR}
 )
 
-ADD_LIBRARY(gpxprovider MODULE ${GPX_SRCS})
+QT4_WRAP_CPP(GPX_MOC_SRCS ${GPX_MOC_HDRS})
 
+ADD_LIBRARY(gpxprovider MODULE ${GPX_SRCS} ${GPX_MOC_SRCS})
+
 TARGET_LINK_LIBRARIES(gpxprovider
   ${QT_QTCORE_LIBRARY} 
   ${QT_QTXML_LIBRARY} 



More information about the QGIS-commit mailing list