diff options
| author | Philip Lowman <philip@yhbt.com> | 2009-09-22 02:21:51 (GMT) |
|---|---|---|
| committer | Philip Lowman <philip@yhbt.com> | 2009-09-22 02:21:51 (GMT) |
| commit | 448f88d46b2567565b3ab31245a2884c3462c0c5 (patch) | |
| tree | 26f977260b1d08fab24fd3cf905452991c1894f0 | |
| parent | 6614cf2568ad8ea975ce3b599e504ea87ae7fb3a (diff) | |
| download | CMake-448f88d46b2567565b3ab31245a2884c3462c0c5.zip CMake-448f88d46b2567565b3ab31245a2884c3462c0c5.tar.gz CMake-448f88d46b2567565b3ab31245a2884c3462c0c5.tar.bz2 | |
Fix Bug #9158: FindBoost.cmake does not work properly with nmake and icl
| -rw-r--r-- | Modules/FindBoost.cmake | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 29b94c1..b05e98e 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -544,7 +544,14 @@ ELSE (_boost_IN_CACHE) # NOTE: this is not perfect yet, if you experience any issues # please report them and use the Boost_COMPILER variable # 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") elseif (MSVC80) SET (_boost_COMPILER "-vc80") @@ -556,13 +563,6 @@ ELSE (_boost_IN_CACHE) SET (_boost_COMPILER "-vc6") # yes, this is correct elseif (BORLAND) 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") set(_boost_COMPILER "-sw") elseif (MINGW) @@ -619,9 +619,10 @@ ELSE (_boost_IN_CACHE) SET( _boost_STATIC_TAG "") set( _boost_ABI_TAG "") IF (WIN32) - IF(MSVC) + IF(MSVC OR "${CMAKE_CXX_COMPILER}" MATCHES "icl" + OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc") SET (_boost_ABI_TAG "g") - ENDIF(MSVC) + ENDIF() IF( Boost_USE_STATIC_LIBS ) SET( _boost_STATIC_TAG "-s") ENDIF( Boost_USE_STATIC_LIBS ) |