[Cmake-commits] CMake branch, next, updated. v3.0.2-5605-gb6b7bd3

[Brad King]

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  b6b7bd3ea7a5524f86370d0a65a58cba55df299a (commit)
       via  c930046410c29834c5c9ec19787525e348a70530 (commit)
      from  08f9eff69c5ae8ff4e086be590b4434d84729da9 (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=b6b7bd3ea7a5524f86370d0a65a58cba55df299a
commit b6b7bd3ea7a5524f86370d0a65a58cba55df299a
Merge: 08f9eff c930046
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 6 09:41:02 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 6 09:41:02 2014 -0400

    Merge topic 'FindBoost-CMP0054' into next
    
    c9300464 FindBoost: Avoid if() quoted auto-dereference


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c930046410c29834c5c9ec19787525e348a70530
commit c930046410c29834c5c9ec19787525e348a70530
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Oct 6 13:50:24 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 6 09:40:41 2014 -0400

    FindBoost: Avoid if() quoted auto-dereference
    
    When testing CMAKE_CXX_COMPILER[_ID] values with if(MATCHES) or
    if(STREQUAL), do not explicitly dereference or quote the variable.
    We want if() to auto-dereference the variable and not its value.

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:


hooks/post-receive
-- 
CMake