[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-509-g79d8534

Brad King brad.king at kitware.com
Tue Nov 11 08:58:37 EST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  79d8534918d16221130115259c3afa51ff97323e (commit)
       via  3dd26463d47d5dd118f85ff5e96184feaa19c987 (commit)
      from  32931f681db4ac02b9a25656d2f4fe8d6e4f43c2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79d8534918d16221130115259c3afa51ff97323e
commit 79d8534918d16221130115259c3afa51ff97323e
Merge: 32931f6 3dd2646
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 11 08:58:36 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 11 08:58:36 2014 -0500

    Merge topic 'update-curl' into next
    
    3dd26463 curl: Disable warnings to avoid changing 3rd party code


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dd26463d47d5dd118f85ff5e96184feaa19c987
commit 3dd26463d47d5dd118f85ff5e96184feaa19c987
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 11 08:57:55 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 11 08:58:01 2014 -0500

    curl: Disable warnings to avoid changing 3rd party code
    
    Tell MSVC to use its lowest warning level inside curl sources.

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,   */

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmcurl/lib/curl_setup.h |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list