[QGIS Commit] r11030 - in trunk/qgis/src: core plugins/grass providers/grass

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-07-06 15:43:58 -0400 (Mon, 06 Jul 2009)
New Revision: 11030

Modified:
   trunk/qgis/src/core/CMakeLists.txt
   trunk/qgis/src/plugins/grass/CMakeLists.txt
   trunk/qgis/src/providers/grass/CMakeLists.txt
Log:
GRASS warnings were fixed; disable warnings on sqlite3/spatialite

Modified: trunk/qgis/src/core/CMakeLists.txt
===================================================================
--- trunk/qgis/src/core/CMakeLists.txt	2009-07-06 13:19:44 UTC (rev 11029)
+++ trunk/qgis/src/core/CMakeLists.txt	2009-07-06 19:43:58 UTC (rev 11030)
@@ -134,6 +134,13 @@
     spatialite/spatialite.c
     )
 
+  IF(MSVC)
+    # dirty code
+    SET_SOURCE_FILES_PROPERTIES(spatialite/sqlite3.c spatialite/spatialite.c PROPERTIES COMPILE_FLAGS /W0)
+  ELSE(MSVC)
+    SET_SOURCE_FILES_PROPERTIES(spatialite/sqlite3.c spatialite/spatialite.c PROPERTIES COMPILE_FLAGS -w)
+  ENDIF(MSVC)
+
   INCLUDE_DIRECTORIES(BEFORE spatialite/headers/spatialite)
 ENDIF (WITH_INTERNAL_SPATIALITE)
 

Modified: trunk/qgis/src/plugins/grass/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/grass/CMakeLists.txt	2009-07-06 13:19:44 UTC (rev 11029)
+++ trunk/qgis/src/plugins/grass/CMakeLists.txt	2009-07-06 19:43:58 UTC (rev 11030)
@@ -16,17 +16,6 @@
 ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
 ADD_DEFINITIONS(-DHAVE_OPENPTY=${HAVE_OPENPTY})
 
-IF (NOT MSVC)
-  IF (PEDANTIC)
-    MESSAGE("providers/grass : -Werror removed for qgsgrassplugin.cpp for now - please get rid of any compiler warnings!")
-  ENDIF (PEDANTIC)
-  # The warnings are caused by multiple definitions of NDEBUG in grass sources
-  # I have submitted a bug to the grass folks in the meantime we need to
-  # disable treating warnings as errors for the affected files TS
-  FILE (GLOB files *.cpp)
-  SET_SOURCE_FILES_PROPERTIES(${files} PROPERTIES COMPILE_FLAGS -Wno-error ) 
-ENDIF (NOT MSVC)
-
 IF (WIN32)
   ADD_DEFINITIONS(-DHAVE_GETPT "-DGRASS_EXPORT=__declspec(dllimport)")
 ELSE (WIN32)

Modified: trunk/qgis/src/providers/grass/CMakeLists.txt
===================================================================
--- trunk/qgis/src/providers/grass/CMakeLists.txt	2009-07-06 13:19:44 UTC (rev 11029)
+++ trunk/qgis/src/providers/grass/CMakeLists.txt	2009-07-06 19:43:58 UTC (rev 11030)
@@ -7,18 +7,6 @@
 
 SET(GRASS_LIB_SRCS qgsgrassprovider.cpp qgsgrass.cpp)
 
-IF (NOT MSVC)
-  IF (PEDANTIC)
-    MESSAGE("providers/grass : -Werror removed for qgsgrassprovider.cpp for now - please get rid of any compiler warnings!")
-  ENDIF (PEDANTIC)
-  # The warnings are caused by multiple definitions of NDEBUG in grass sources
-  # I have submitted a bug to the grass folks in the meantime we need to
-  # disable treating warnings as errors for the affected files
-  SET_SOURCE_FILES_PROPERTIES(qgsgrassprovider.cpp PROPERTIES COMPILE_FLAGS -Wno-error )
-  SET_SOURCE_FILES_PROPERTIES(qgsgrass.cpp PROPERTIES COMPILE_FLAGS -Wno-error )   
-  SET_SOURCE_FILES_PROPERTIES(provider.cpp PROPERTIES COMPILE_FLAGS -Wno-error )
-ENDIF (NOT MSVC)
-
 ########################################################
 # Build