Skip to content
Permalink
Browse files

GRASS warnings were fixed; disable warnings on sqlite3/spatialite

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11030 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Jul 6, 2009
1 parent c5f8e6d commit 97d6c192d7d083249cd89cf3cd4641accabcdb28
Showing with 7 additions and 23 deletions.
  1. +7 −0 src/core/CMakeLists.txt
  2. +0 −11 src/plugins/grass/CMakeLists.txt
  3. +0 −12 src/providers/grass/CMakeLists.txt
@@ -134,6 +134,13 @@ IF (WITH_INTERNAL_SPATIALITE)
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)

@@ -16,17 +16,6 @@ SUBDIRS(modules-common ${GRASS_MODULES_DIR} scripts themes)
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)
@@ -7,18 +7,6 @@ SET(GRASS_PROVIDER_SRCS provider.cpp)

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

0 comments on commit 97d6c19

Please sign in to comment.
You can’t perform that action at this time.