[Cmake-commits] [cmake-commits] lowman committed FindBoost.cmake 1.43 1.44

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv25849

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


Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.43
retrieving revision 1.44
diff -C 2 -d -r1.43 -r1.44
*** FindBoost.cmake	20 Sep 2009 15:33:06 -0000	1.43
--- FindBoost.cmake	22 Sep 2009 02:21:51 -0000	1.44
***************
*** 545,549 ****
      # please report them and use the Boost_COMPILER variable
      # to work around the problems.
!     if (MSVC90)
        SET (_boost_COMPILER "-vc90")
      elseif (MSVC80)
--- 545,556 ----
      # please report them and use the Boost_COMPILER variable
      # to work around the problems.
!     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)
***************
*** 557,567 ****
      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")
--- 564,567 ----
***************
*** 620,626 ****
    set( _boost_ABI_TAG "")
    IF (WIN32)
!     IF(MSVC)
        SET (_boost_ABI_TAG "g")
!     ENDIF(MSVC)
      IF( Boost_USE_STATIC_LIBS )
        SET( _boost_STATIC_TAG "-s")
--- 620,627 ----
    set( _boost_ABI_TAG "")
    IF (WIN32)
!     IF(MSVC OR "${CMAKE_CXX_COMPILER}" MATCHES "icl"
!             OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
        SET (_boost_ABI_TAG "g")
!     ENDIF()
      IF( Boost_USE_STATIC_LIBS )
        SET( _boost_STATIC_TAG "-s")