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

Fix Bug #9158: FindBoost.cmake does not work properly with nmake and icl

Browse Source
This commit is contained in:
Philip Lowman 2009-09-21 22:21:51 -04:00
parent 6614cf2568
commit 448f88d46b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Modules/FindBoost.cmake
View File

@ -544,7 +544,14 @@ ELSE (_boost_IN_CACHE)
# NOTE: this is not perfect yet, if you experience any issues # NOTE: this is not perfect yet, if you experience any issues
# please report them and use the Boost_COMPILER variable # please report them and use the Boost_COMPILER variable
# to work around the problems. # to work around the problems.
if (MSVC90) if("${CMAKE_CXX_COMPILER}" MATCHES "icl"
OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
if(WIN32)
set (_boost_COMPILER "-iw")
else()
set (_boost_COMPILER "-il")
endif()
elseif (MSVC90)
SET (_boost_COMPILER "-vc90") SET (_boost_COMPILER "-vc90")
elseif (MSVC80) elseif (MSVC80)
SET (_boost_COMPILER "-vc80") SET (_boost_COMPILER "-vc80")
@ -556,13 +563,6 @@ ELSE (_boost_IN_CACHE)
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}" MATCHES "icl"
OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
if(WIN32)
set (_boost_COMPILER "-iw")
else()
set (_boost_COMPILER "-il")
endif()
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)
@ -619,9 +619,10 @@ ELSE (_boost_IN_CACHE)
SET( _boost_STATIC_TAG "") SET( _boost_STATIC_TAG "")
set( _boost_ABI_TAG "") set( _boost_ABI_TAG "")
IF (WIN32) IF (WIN32)
IF(MSVC) IF(MSVC OR "${CMAKE_CXX_COMPILER}" MATCHES "icl"
OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
SET (_boost_ABI_TAG "g") SET (_boost_ABI_TAG "g")
ENDIF(MSVC) ENDIF()
IF( Boost_USE_STATIC_LIBS ) IF( Boost_USE_STATIC_LIBS )
SET( _boost_STATIC_TAG "-s") SET( _boost_STATIC_TAG "-s")
ENDIF( Boost_USE_STATIC_LIBS ) ENDIF( Boost_USE_STATIC_LIBS )