kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindBoost-CMP0054' 

c9300464 FindBoost: Avoid if() quoted auto-dereference
This commit is contained in:
Brad King 2014-10-07 14:12:18 -04:00 committed by CMake Topic Stage
parent 1ed0379f79 c930046410
commit 68abbdbd8a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindBoost.cmake
View File

@ -375,9 +375,9 @@ endfunction()
# Guesses Boost's compiler prefix used in built library names # Guesses Boost's compiler prefix used in built library names
# Returns the guess by setting the variable pointed to by _ret # Returns the guess by setting the variable pointed to by _ret
function(_Boost_GUESS_COMPILER_PREFIX _ret) function(_Boost_GUESS_COMPILER_PREFIX _ret)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel"
OR "${CMAKE_CXX_COMPILER}" MATCHES "icl" OR CMAKE_CXX_COMPILER MATCHES "icl"
OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc") OR CMAKE_CXX_COMPILER MATCHES "icpc")
if(WIN32) if(WIN32)
set (_boost_COMPILER "-iw") set (_boost_COMPILER "-iw")
else() else()
@ -403,7 +403,7 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
set(_boost_COMPILER "-vc6") # yes, this is correct set(_boost_COMPILER "-vc6") # yes, this is correct
elseif (BORLAND) elseif (BORLAND)
set(_boost_COMPILER "-bcb") set(_boost_COMPILER "-bcb")
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "SunPro") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
set(_boost_COMPILER "-sw") set(_boost_COMPILER "-sw")
elseif (MINGW) elseif (MINGW)
if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34) if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)