summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-10-07 18:12:18 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-10-07 18:12:18 (GMT)
commit68abbdbd8af8457f30697ccbb2ace595b1ad5802 (patch)
tree38c0c3d4c2ff82d03f784043adbde1a2ad809381 /Modules
parent1ed0379f7960d93e4da0465679169fa94de09ad8 (diff)
parentc930046410c29834c5c9ec19787525e348a70530 (diff)
downloadCMake-68abbdbd8af8457f30697ccbb2ace595b1ad5802.zip
CMake-68abbdbd8af8457f30697ccbb2ace595b1ad5802.tar.gz
CMake-68abbdbd8af8457f30697ccbb2ace595b1ad5802.tar.bz2
Merge topic 'FindBoost-CMP0054'
c9300464 FindBoost: Avoid if() quoted auto-dereference
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindBoost.cmake8
1 files changed, 4 insertions, 4 deletions
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)