[Cmake-commits] [cmake-commits] dgregor committed FindBoost.cmake 1.11 1.12

[cmake-commits at cmake.org]

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

Modified Files:
	FindBoost.cmake 
Log Message:
BUG: Work around Boost 1.36.0 bug fix on Darwin by setting the mangled compiler name to -xgccVERSION


Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** FindBoost.cmake	14 Jul 2008 17:52:53 -0000	1.11
--- FindBoost.cmake	28 Jul 2008 18:33:40 -0000	1.12
***************
*** 365,387 ****
    ENDIF(MINGW)
    IF (UNIX)
!     IF (APPLE)
!       # Due to a quirk in Boost.Build, there is no compiler name
!       # mangled into library names on Mac OS X/Darwin.
!       SET (_boost_COMPILER "")
!     ELSE (APPLE)
!       IF (NOT CMAKE_COMPILER_IS_GNUCC)
!         # We assume that we have the Intel compiler.
!         SET (_boost_COMPILER "-il")
!       ELSE (NOT CMAKE_COMPILER_IS_GNUCC)
!         # Determine which version of GCC we have.
!         EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
!             ARGS -dumpversion
!             OUTPUT_VARIABLE _boost_COMPILER_VERSION
          )
!         STRING(REGEX REPLACE "([0-9])\\.([0-9])\\.[0-9]" "\\1\\2"
!                _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
          SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
!       ENDIF (NOT CMAKE_COMPILER_IS_GNUCC)
!     ENDIF (APPLE)
    ENDIF(UNIX)
  
--- 365,393 ----
    ENDIF(MINGW)
    IF (UNIX)
!     IF (NOT CMAKE_COMPILER_IS_GNUCC)
!       # We assume that we have the Intel compiler.
!       SET (_boost_COMPILER "-il")
!     ELSE (NOT CMAKE_COMPILER_IS_GNUCC)
!       # Determine which version of GCC we have.
!       EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
!         ARGS -dumpversion
!         OUTPUT_VARIABLE _boost_COMPILER_VERSION
          )
!       STRING(REGEX REPLACE "([0-9])\\.([0-9])\\.[0-9]" "\\1\\2"
!         _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
!       IF(APPLE)
!         IF (${Boost_MINOR_VERSION} GREATER 35)
!           # In Boost 1.36.0 and newer, the mangled compiler name used
!           # on Mac OS X/Darwin is "xgcc".
!           SET (_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
!         ELSE()
!           # In Boost <= 1.35.0, there is no mangled compiler name for
!           # the Mac OS X/Darwin version of GCC.
!           SET (_boost_COMPILER "")
!         ENDIF()
!       ELSE()
          SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
!       ENDIF()
!     ENDIF (NOT CMAKE_COMPILER_IS_GNUCC)
    ENDIF(UNIX)