[QGIS Commit] r15200 - trunk/qgis/cmake

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-02-18 07:33:27 -0800 (Fri, 18 Feb 2011)
New Revision: 15200

Modified:
   trunk/qgis/cmake/SIPMacros.cmake
Log:
fix sip macro change from r15197

Modified: trunk/qgis/cmake/SIPMacros.cmake
===================================================================
--- trunk/qgis/cmake/SIPMacros.cmake	2011-02-18 15:18:41 UTC (rev 15199)
+++ trunk/qgis/cmake/SIPMacros.cmake	2011-02-18 15:33:27 UTC (rev 15200)
@@ -86,15 +86,17 @@
     ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )
 
     # Suppress warnings
-    IF(MSVC AND PEDANTIC)
-      # 4996 deprecation warnings (bindings re-export deprecated methods)
-      # 4701 potentially uninitialized variable used (sip generated code)
-      # 4702 unreachable code (sip generated code)
-      ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 )
-    ELSE(MSVC)
-      # disable all warnings
-      ADD_DEFINITIONS( -w )
-    ENDIF(MSVC)
+    IF(PEDANTIC)
+      IF(MSVC)
+        # 4996 deprecation warnings (bindings re-export deprecated methods)
+        # 4701 potentially uninitialized variable used (sip generated code)
+        # 4702 unreachable code (sip generated code)
+        ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 )
+      ELSE(MSVC)
+        # disable all warnings
+        ADD_DEFINITIONS( -w )
+      ENDIF(MSVC)
+    ENDIF(PEDANTIC)
 
     ADD_CUSTOM_COMMAND(
         OUTPUT ${_sip_output_files}