Skip to content
Permalink
Browse files
fix msvc fixes
git-svn-id: http://svn.osgeo.org/qgis/trunk@15213 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Feb 19, 2011
1 parent 20587d2 commit 6b68070ca7912155e242680a3cea1cbd5a70caef
Showing with 9 additions and 5 deletions.
  1. +2 −2 src/analysis/raster/qgsrastercalcparser.yy
  2. +2 −0 src/core/qgssearchstringlexer.ll
  3. +5 −3 src/gui/CMakeLists.txt
@@ -20,8 +20,8 @@
#include "qgsrastercalcnode.h"

#ifdef _MSC_VER
# pragma warnings( disable: 4065 ) // switch statement contains 'default' but no 'case' labels
# pragma warnings( disable: 4701 ) // Potentially uninitialized local variable 'name' used
# pragma warning( disable: 4065 ) // switch statement contains 'default' but no 'case' labels
# pragma warning( disable: 4701 ) // Potentially uninitialized local variable 'name' used
#endif

// don't redeclare malloc/free
@@ -36,7 +36,9 @@
// which doesn't in MSVC compiler
#define YY_NEVER_INTERACTIVE 1

#ifndef YY_NO_UNPUT
#define YY_NO_UNPUT // unused
#endif

#ifdef _MSC_VER
#define YY_NO_UNISTD_H
@@ -135,10 +135,12 @@ IF (WIN32)
ENDIF (MSVC)
ENDIF (WIN32)

IF(NOT MSVC)
# disable deprecation warnings for qgisinterface (re-exporting deprecated methods)
# disable deprecation warnings for qgisinterface (re-exporting deprecated methods)
IF(MSVC)
SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/src/gui/moc_qgisinterface.cxx PROPERTIES COMPILE_FLAGS "-wd4996")
ELSE(MSVC)
SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/src/gui/moc_qgisinterface.cxx PROPERTIES COMPILE_FLAGS "-w")
ENDIF(NOT MSVC)
ENDIF(MSVC)

#############################################################
# qgis_gui library

0 comments on commit 6b68070

Please sign in to comment.