[Cmake-commits] CMake branch, next, updated. v3.1.0-1876-gf06bf49

Brad King brad.king at kitware.com
Wed Jan 14 09:20:41 EST 2015


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  f06bf49a9982f5adc55406b8c510c241489941e5 (commit)
       via  74b8f7862291d795eba525f3103f1370b8ec7518 (commit)
      from  a382e6004e61ccd56b12f3d4ab3c4c08fdb4d777 (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=f06bf49a9982f5adc55406b8c510c241489941e5
commit f06bf49a9982f5adc55406b8c510c241489941e5
Merge: a382e60 74b8f78
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 14 09:20:41 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 14 09:20:41 2015 -0500

    Merge topic 'zlib-suppress-warnings' into next
    
    74b8f786 zlib: Disable warnings to avoid changing 3rd party code


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74b8f7862291d795eba525f3103f1370b8ec7518
commit 74b8f7862291d795eba525f3103f1370b8ec7518
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 14 09:20:27 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 14 09:20:27 2015 -0500

    zlib: Disable warnings to avoid changing 3rd party code

diff --git a/Utilities/cmzlib/CMakeLists.txt b/Utilities/cmzlib/CMakeLists.txt
index 66e8be2..0be48f1 100644
--- a/Utilities/cmzlib/CMakeLists.txt
+++ b/Utilities/cmzlib/CMakeLists.txt
@@ -1,5 +1,13 @@
 PROJECT(CMZLIB)
 
+# Disable warnings to avoid changing 3rd party code.
+if(CMAKE_C_COMPILER_ID MATCHES
+    "^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
+elseif(CMAKE_C_COMPILER_ID STREQUAL "PathScale")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall")
+endif()
+
 INCLUDE_DIRECTORIES(
   "${CMZLIB_SOURCE_DIR}"
   "${CMZLIB_SOURCE_DIR}/.."

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

Summary of changes:
 Utilities/cmzlib/CMakeLists.txt |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list