fix msvc fixes

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15213 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 19, 2011 · 9f135b8 · 9f135b8
1 parent 67081a4
commit 9f135b8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/analysis/raster/qgsrastercalcparser.yy b/src/analysis/raster/qgsrastercalcparser.yy
@@ -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

diff --git a/src/core/qgssearchstringlexer.ll b/src/core/qgssearchstringlexer.ll
@@ -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

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -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