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 96608c4fd230f3ca50b0f68eb75c0cedc0507228 (commit)
via 8ffd8b702415904a3a90cde5c6aaa06678a17635 (commit)
from 122cef7ce4290f4163d56215babf7eafa5142249 (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=96608c4fd230f3ca50b0f68eb75c0cedc0507228
commit 96608c4fd230f3ca50b0f68eb75c0cedc0507228
Merge: 122cef7 8ffd8b7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 13 12:08:55 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 13 12:08:55 2015 -0500
Merge topic 'cdash_upload_file_mode' into next
8ffd8b70 jsoncpp: Disable warnings to avoid changing 3rd party code
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ffd8b702415904a3a90cde5c6aaa06678a17635
commit 8ffd8b702415904a3a90cde5c6aaa06678a17635
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 13 10:45:23 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jan 13 12:07:31 2015 -0500
jsoncpp: Disable warnings to avoid changing 3rd party code
Add '-w' or equivalent flag on compilers supporting it.
Tell MSVC to use its lowest warning level inside jsoncpp sources.
diff --git a/Utilities/cmjsoncpp/CMakeLists.txt
b/Utilities/cmjsoncpp/CMakeLists.txt
index fb2236f..7289c8f 100644
--- a/Utilities/cmjsoncpp/CMakeLists.txt
+++ b/Utilities/cmjsoncpp/CMakeLists.txt
@@ -1,5 +1,13 @@
project(JsonCpp)
+# Disable warnings to avoid changing 3rd party code.
+if(CMAKE_CXX_COMPILER_ID MATCHES
+ "^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$")
+ set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -w")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "PathScale")
+ set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -woffall")
+endif()
+
set(JSONCPP_SOURCES
json_tool.h
json_reader.cpp
diff --git a/Utilities/cmjsoncpp/json/config.h
b/Utilities/cmjsoncpp/json/config.h
index afd3a45..5c711e3 100644
--- a/Utilities/cmjsoncpp/json/config.h
+++ b/Utilities/cmjsoncpp/json/config.h
@@ -6,6 +6,10 @@
#ifndef JSON_CONFIG_H_INCLUDED
#define JSON_CONFIG_H_INCLUDED
+#if defined(_MSC_VER)
+# pragma warning(push,1)
+#endif
+
/// If defined, indicates that json library is embedded in CppTL library.
//# define JSON_IN_CPPTL 1
-----------------------------------------------------------------------
Summary of changes:
Utilities/cmjsoncpp/CMakeLists.txt | 8 ++++++++
Utilities/cmjsoncpp/json/config.h | 4 ++++
2 files changed, 12 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
