summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-11-12 14:35:51 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-11-12 14:35:51 (GMT)
commit03dad03a54c86b2ea6b355c1f29354b7843da6a5 (patch)
treef537a8f6721b9e55fe3a11bb18f9742db483065f /Utilities
parent7d9611433b2d28ab4b183f4734065867c8887926 (diff)
parent3dd26463d47d5dd118f85ff5e96184feaa19c987 (diff)
downloadCMake-03dad03a54c86b2ea6b355c1f29354b7843da6a5.zip
CMake-03dad03a54c86b2ea6b355c1f29354b7843da6a5.tar.gz
CMake-03dad03a54c86b2ea6b355c1f29354b7843da6a5.tar.bz2
Merge topic 'update-curl'
3dd26463 curl: Disable warnings to avoid changing 3rd party code
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/cmcurl/lib/curl_setup.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h
index 12238ca..9cc5758 100644
--- a/Utilities/cmcurl/lib/curl_setup.h
+++ b/Utilities/cmcurl/lib/curl_setup.h
@@ -80,6 +80,10 @@
#endif /* HAVE_CONFIG_H */
+#if defined(_MSC_VER)
+# pragma warning(push,1)
+#endif
+
/* ================================================================ */
/* Definition of preprocessor macros/symbols which modify compiler */
/* behavior or generated code characteristics must be done here, */