fix windows link errors

jef · jef · commit af1e4755ea25 · 2008-06-30T13:09:41.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8692 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/delimitedtext/CMakeLists.txt b/src/providers/delimitedtext/CMakeLists.txt
@@ -4,9 +4,7 @@
 
 SET (DTEXT_SRCS qgsdelimitedtextprovider.cpp)
 
-SET (DTEXT_MOC_HDRS
-	qgsdelimitedtextprovider.h
-)
+SET (DTEXT_MOC_HDRS	qgsdelimitedtextprovider.h)
 
 ########################################################
 # Build
@@ -18,7 +16,9 @@ INCLUDE_DIRECTORIES(
   ${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} 
diff --git a/src/providers/gpx/CMakeLists.txt b/src/providers/gpx/CMakeLists.txt
@@ -8,7 +8,6 @@ SET (GPX_MOC_HDRS
 	qgsgpxprovider.h
 )
 
-
 ########################################################
 # Build
 
@@ -18,7 +17,9 @@ INCLUDE_DIRECTORIES(
   ${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} 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ SET (GPX_MOC_HDRS`
`8`	`8`	`qgsgpxprovider.h`
`9`	`9`	`)`
`10`	`10`
`11`		`-`
`12`	`11`	`########################################################`
`13`	`12`	`# Build`
`14`	`13`
`@@ -18,7 +17,9 @@ INCLUDE_DIRECTORIES(`
`18`	`17`	`${EXPAT_INCLUDE_DIR}`
`19`	`18`	`)`
`20`	`19`
`21`		`-ADD_LIBRARY(gpxprovider MODULE ${GPX_SRCS})`
	`20`	`+QT4_WRAP_CPP(GPX_MOC_SRCS ${GPX_MOC_HDRS})`
	`21`	`+`
	`22`	`+ADD_LIBRARY(gpxprovider MODULE ${GPX_SRCS} ${GPX_MOC_SRCS})`
`22`	`23`
`23`	`24`	`TARGET_LINK_LIBRARIES(gpxprovider`
`24`	`25`	`${QT_QTCORE_LIBRARY}`