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 131df017bf969f67d62804e376589589c4577d4d (commit)
via 0338cdf79e5e88364a4a1260b6babe4b92302666 (commit)
via f17989b32dece80f430db33f15dc25141be4d3af (commit)
via 594cdd4d28f4583beefae6d1d0e46defca511b36 (commit)
via ab74ad5a5f26049effbd1eac119ec40e438f38df (commit)
from 9e79dcf1ccbfa2c1c1b711f8e4704b549181b4a8 (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=131df017bf969f67d62804e376589589c4577d4d
commit 131df017bf969f67d62804e376589589c4577d4d
Merge: 9e79dcf 0338cdf
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Oct 6 07:51:38 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 6 07:51:38 2014 -0400
Merge topic 'FindBoost-CMP0054' into next
0338cdf7 FindBoost: Work around CMP0054 warnings
f17989b3 CMake Nightly Date Stamp
594cdd4d CMake Nightly Date Stamp
ab74ad5a CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0338cdf79e5e88364a4a1260b6babe4b92302666
commit 0338cdf79e5e88364a4a1260b6babe4b92302666
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Oct 6 13:50:24 2014 +0200
Commit: Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Oct 6 13:50:24 2014 +0200
FindBoost: Work around CMP0054 warnings
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 0eec4ad..3642b3e 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -375,9 +375,9 @@ endfunction()
# Guesses Boost's compiler prefix used in built library names
# Returns the guess by setting the variable pointed to by _ret
function(_Boost_GUESS_COMPILER_PREFIX _ret)
- if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icl"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel"
+ OR CMAKE_CXX_COMPILER MATCHES "icl"
+ OR CMAKE_CXX_COMPILER MATCHES "icpc")
if(WIN32)
set (_boost_COMPILER "-iw")
else()
@@ -403,7 +403,7 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
set(_boost_COMPILER "-vc6") # yes, this is correct
elseif (BORLAND)
set(_boost_COMPILER "-bcb")
- elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "SunPro")
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
set(_boost_COMPILER "-sw")
elseif (MINGW)
if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 8 ++++----
Source/CMakeVersion.cmake | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake