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 5cd18731aa5216246cd017372bd45b8877194572 (commit)
via a44294641e27c74657665079147a41b81ceb3372 (commit)
from ff07a15758b434369771229ca2a664496d8d4522 (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=5cd18731aa5216246cd017372bd45b8877194572
commit 5cd18731aa5216246cd017372bd45b8877194572
Merge: ff07a15 a442946
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 14 09:56:04 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 14 09:56:04 2015 -0500
Merge topic 'cdash_upload_file_mode' into next
a4429464 jsoncpp: Fix warning suppression to not use C flags for C++
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a44294641e27c74657665079147a41b81ceb3372
commit a44294641e27c74657665079147a41b81ceb3372
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 14 09:55:52 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 14 09:55:52 2015 -0500
jsoncpp: Fix warning suppression to not use C flags for C++
diff --git a/Utilities/cmjsoncpp/CMakeLists.txt
b/Utilities/cmjsoncpp/CMakeLists.txt
index 1a10295..9f29558 100644
--- a/Utilities/cmjsoncpp/CMakeLists.txt
+++ b/Utilities/cmjsoncpp/CMakeLists.txt
@@ -3,9 +3,9 @@ project(JsonCpp CXX)
# 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")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "PathScale")
- set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -woffall")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -woffall")
endif()
set(JSONCPP_SOURCES
-----------------------------------------------------------------------
Summary of changes:
Utilities/cmjsoncpp/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
