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, master has been updated
via 95d84f76d9a8e27eb974fce7d06b7f2e312a05e6 (commit)
via 29c3edb87adedd82e816552d958f4c3540a1511b (commit)
from c8ba39719409dc106f76c0b67f805158be01b3b4 (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=95d84f76d9a8e27eb974fce7d06b7f2e312a05e6
commit 95d84f76d9a8e27eb974fce7d06b7f2e312a05e6
Merge: c8ba397 29c3edb
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 21 15:08:07 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Oct 21 15:08:07 2014 -0400
Merge topic 'cmake-cmp0054-warnings'
29c3edb8 Avoid if() quoted auto-dereference
diff --cc Utilities/cmlibarchive/CMakeLists.txt
index 220a4c6,3f41dd1..b150408
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@@ -56,11 -56,13 +56,11 @@@ SET(CMAKE_REQUIRED_LIBRARIES
SET(CMAKE_REQUIRED_FLAGS)
# Disable warnings to avoid changing 3rd party code.
- IF("${CMAKE_C_COMPILER_ID}" MATCHES
+ 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}" MATCHES "^(PathScale)$")
+ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "PathScale")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall")
-ELSEIF(BORLAND)
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-")
ENDIF()
# Enable CTest/CDash support
diff --cc Utilities/cmliblzma/CMakeLists.txt
index 27ec2d0,4f2b9ba..c03147f
--- a/Utilities/cmliblzma/CMakeLists.txt
+++ b/Utilities/cmliblzma/CMakeLists.txt
@@@ -201,11 -201,13 +201,11 @@@ INCLUDE_DIRECTORIES
)
# Disable warnings to avoid changing 3rd party code.
- IF("${CMAKE_C_COMPILER_ID}" MATCHES
+ 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}" MATCHES "^(PathScale)$")
+ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "PathScale")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall")
-ELSEIF(BORLAND)
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-")
ENDIF()
ADD_LIBRARY(cmliblzma ${LZMA_SRCS})
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 2 +-
CompileFlags.cmake | 2 +-
Modules/CMakeDetermineCCompiler.cmake | 8 ++++----
Modules/CMakeDetermineCompilerId.cmake | 2 +-
Modules/CMakeDetermineFortranCompiler.cmake | 8 ++++----
...eratorDetermineCompilerMacrosAndIncludeDirs.cmake | 2 +-
Modules/CMakeFindBinUtils.cmake | 12 ++++++------
Modules/CMakeForceCompiler.cmake | 4 ++--
Modules/FindMPI.cmake | 2 +-
Modules/FortranCInterface/CMakeLists.txt | 2 +-
Modules/Platform/eCos.cmake | 2 +-
Tests/Assembler/CMakeLists.txt | 2 +-
Tests/CMakeLists.txt | 2 +-
Tests/ForceInclude/CMakeLists.txt | 2 +-
Tests/Fortran/CMakeLists.txt | 18 +++++++++---------
Tests/FortranC/CMakeLists.txt | 2 +-
Tests/LinkStatic/CMakeLists.txt | 2 +-
Tests/ModuleDefinition/CMakeLists.txt | 2 +-
Tests/PDBDirectoryAndName/CMakeLists.txt | 2 +-
Tests/PrecompiledHeader/CMakeLists.txt | 2 +-
Tests/Preprocess/CMakeLists.txt | 2 +-
Tests/TryCompile/CMakeLists.txt | 4 ++--
Utilities/cmlibarchive/CMakeLists.txt | 8 ++++----
Utilities/cmliblzma/CMakeLists.txt | 4 ++--
24 files changed, 49 insertions(+), 49 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
